diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
commit | b16f4ddd7e5422a842beaeaeea0c411bd432d0f4 (patch) | |
tree | 3268a5a64dd96a1ebc80d1af24cdaa093d496385 /0001-mmu-Remove-unneeded-semicolon.patch | |
parent | d5e4e88fb9466ff04a7cd07c1ae8323bbbc36b8b (diff) | |
parent | 95dc4cf28c756d993d2080a495935006100a62a2 (diff) | |
download | kernel-b16f4ddd7e5422a842beaeaeea0c411bd432d0f4.tar.gz kernel-b16f4ddd7e5422a842beaeaeea0c411bd432d0f4.tar.xz kernel-b16f4ddd7e5422a842beaeaeea0c411bd432d0f4.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31
Diffstat (limited to '0001-mmu-Remove-unneeded-semicolon.patch')
-rw-r--r-- | 0001-mmu-Remove-unneeded-semicolon.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/0001-mmu-Remove-unneeded-semicolon.patch b/0001-mmu-Remove-unneeded-semicolon.patch deleted file mode 100644 index 3931ff586..000000000 --- a/0001-mmu-Remove-unneeded-semicolon.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zheng Bin <zhengbin13@huawei.com> -Date: Fri, 24 Apr 2020 15:36:01 +0800 -Subject: [PATCH] mmu: Remove unneeded semicolon - -Fixes coccicheck warning: - -drivers/gpu/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h:307:2-3: Unneeded semicolon -drivers/gpu/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c:583:2-3: Unneeded semicolon - -Reported-by: Hulk Robot <hulkci@huawei.com> -Signed-off-by: Zheng Bin <zhengbin13@huawei.com> -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- - drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- - drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c -index 41640e0584ac..199f94e15c5f 100644 ---- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c -+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c -@@ -580,7 +580,7 @@ nvkm_vmm_iter(struct nvkm_vmm *vmm, const struct nvkm_vmm_page *page, - it.pte[it.lvl]++; - } - } -- }; -+ } - - nvkm_vmm_flush(&it); - return ~0ULL; -diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h -index 5e55ecbd8005..d3f8f916d0db 100644 ---- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h -+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h -@@ -304,7 +304,7 @@ int tu102_vmm_new(struct nvkm_mmu *, bool, u64, u64, void *, u32, - FILL(VMM, PT, PTEI, _ptes, MAP, _addr); \ - PTEI += _ptes; \ - PTEN -= _ptes; \ -- }; \ -+ } \ - nvkm_done((PT)->memory); \ - } while(0) - --- -2.26.2 - |