From: Greg Kroah-Hartman Date: Mon, 6 Mar 2023 06:39:42 +0000 (+0100) Subject: drop queue-4.19/powerpc-mm-rearrange-if-else-block-to-avoid-clang-warning.patch X-Git-Tag: v6.2.3~118 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9e434545853259eeb102013d45d318e12e5ce1f;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/powerpc-mm-rearrange-if-else-block-to-avoid-clang-warning.patch Patch is trying to touch a file that isn't even present. --- diff --git a/queue-4.19/powerpc-mm-rearrange-if-else-block-to-avoid-clang-warning.patch b/queue-4.19/powerpc-mm-rearrange-if-else-block-to-avoid-clang-warning.patch deleted file mode 100644 index b1b47669d01..00000000000 --- a/queue-4.19/powerpc-mm-rearrange-if-else-block-to-avoid-clang-warning.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d78c8e32890ef7eca79ffd67c96022c7f9d8cce4 Mon Sep 17 00:00:00 2001 -From: Anders Roxell -Date: Wed, 10 Aug 2022 13:43:18 +0200 -Subject: powerpc/mm: Rearrange if-else block to avoid clang warning - -From: Anders Roxell - -commit d78c8e32890ef7eca79ffd67c96022c7f9d8cce4 upstream. - -Clang warns: - - arch/powerpc/mm/book3s64/radix_tlb.c:1191:23: error: variable 'hstart' is uninitialized when used here - __tlbiel_va_range(hstart, hend, pid, - ^~~~~~ - arch/powerpc/mm/book3s64/radix_tlb.c:1191:31: error: variable 'hend' is uninitialized when used here - __tlbiel_va_range(hstart, hend, pid, - ^~~~ - -Rework the 'if (IS_ENABLE(CONFIG_TRANSPARENT_HUGEPAGE))' so hstart/hend -is always initialized to silence the warnings. That will also simplify -the 'else' path. Clang is getting confused with these warnings, but the -warnings is a false-positive. - -Suggested-by: Arnd Bergmann -Suggested-by: Nathan Chancellor -Reviewed-by: Christophe Leroy -Reviewed-by: Nathan Chancellor -Signed-off-by: Anders Roxell -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/20220810114318.3220630-1-anders.roxell@linaro.org -Signed-off-by: Daniel Díaz -Signed-off-by: Greg Kroah-Hartman ---- - arch/powerpc/mm/book3s64/radix_tlb.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c -index 50b70105364f..e50bc5fc7ddf 100644 ---- a/arch/powerpc/mm/book3s64/radix_tlb.c -+++ b/arch/powerpc/mm/book3s64/radix_tlb.c -@@ -1184,15 +1184,12 @@ static inline void __radix__flush_tlb_range(struct mm_struct *mm, - } - } - } else { -- bool hflush = false; -+ bool hflush; - unsigned long hstart, hend; - -- if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { -- hstart = (start + PMD_SIZE - 1) & PMD_MASK; -- hend = end & PMD_MASK; -- if (hstart < hend) -- hflush = true; -- } -+ hstart = (start + PMD_SIZE - 1) & PMD_MASK; -+ hend = end & PMD_MASK; -+ hflush = IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && hstart < hend; - - if (type == FLUSH_TYPE_LOCAL) { - asm volatile("ptesync": : :"memory"); --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 29387c51446..47658318493 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1,7 +1,6 @@ hid-asus-remove-check-for-same-led-brightness-on-set.patch hid-asus-use-spinlock-to-protect-concurrent-accesses.patch hid-asus-use-spinlock-to-safely-schedule-workers.patch -powerpc-mm-rearrange-if-else-block-to-avoid-clang-warning.patch arm-omap2-fix-memory-leak-in-realtime_counter_init.patch arm-zynq-fix-refcount-leak-in-zynq_early_slcr_init.patch arm64-dts-meson-gx-fix-ethernet-mac-address-unit-nam.patch