From: Greg Kroah-Hartman Date: Fri, 30 Nov 2018 15:21:56 +0000 (+0100) Subject: drop arm-clean-up-per-processor-check_bugs-method-call.patch from 4.14 and 4.19 X-Git-Tag: v4.19.6~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c1f5a09738b2dbee5aae81073cb8776ba9d6aed;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-clean-up-per-processor-check_bugs-method-call.patch from 4.14 and 4.19 --- diff --git a/queue-4.14/arm-clean-up-per-processor-check_bugs-method-call.patch b/queue-4.14/arm-clean-up-per-processor-check_bugs-method-call.patch deleted file mode 100644 index 52b98834fcb..00000000000 --- a/queue-4.14/arm-clean-up-per-processor-check_bugs-method-call.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a1532514df66413e1f503540ea2f9a3d017d1030 Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Thu, 19 Jul 2018 12:43:03 +0100 -Subject: ARM: clean up per-processor check_bugs method call - -[ Upstream commit 945aceb1db8885d3a35790cf2e810f681db52756 ] - -Call the per-processor type check_bugs() method in the same way as we -do other per-processor functions - move the "processor." detail into -proc-fns.h. - -Reviewed-by: Julien Thierry -Signed-off-by: Russell King -Signed-off-by: Sasha Levin ---- - arch/arm/include/asm/proc-fns.h | 1 + - arch/arm/kernel/bugs.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h -index e25f4392e1b2..30c499146320 100644 ---- a/arch/arm/include/asm/proc-fns.h -+++ b/arch/arm/include/asm/proc-fns.h -@@ -99,6 +99,7 @@ extern void cpu_do_suspend(void *); - extern void cpu_do_resume(void *); - #else - #define cpu_proc_init processor._proc_init -+#define cpu_check_bugs processor.check_bugs - #define cpu_proc_fin processor._proc_fin - #define cpu_reset processor.reset - #define cpu_do_idle processor._do_idle -diff --git a/arch/arm/kernel/bugs.c b/arch/arm/kernel/bugs.c -index 7be511310191..d41d3598e5e5 100644 ---- a/arch/arm/kernel/bugs.c -+++ b/arch/arm/kernel/bugs.c -@@ -6,8 +6,8 @@ - void check_other_bugs(void) - { - #ifdef MULTI_CPU -- if (processor.check_bugs) -- processor.check_bugs(); -+ if (cpu_check_bugs) -+ cpu_check_bugs(); - #endif - } - --- -2.17.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 02dcb995172..9a6c1d0a96c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -51,7 +51,6 @@ floppy-fix-race-condition-in-__floppy_read_block_0.patch powerpc-io-fix-the-io-workarounds-code-to-work-with-.patch perf-x86-intel-uncore-add-more-imc-pci-ids-for-kabyl.patch arm-make-lookup_processor_type-non-__init.patch -arm-clean-up-per-processor-check_bugs-method-call.patch sunrpc-fix-a-bogus-get-put-in-generic_key_to_expire.patch kdb-use-strscpy-with-destination-buffer-size.patch powerpc-numa-suppress-vphn-is-not-supported-messages.patch diff --git a/queue-4.19/arm-clean-up-per-processor-check_bugs-method-call.patch b/queue-4.19/arm-clean-up-per-processor-check_bugs-method-call.patch deleted file mode 100644 index 5435a60400c..00000000000 --- a/queue-4.19/arm-clean-up-per-processor-check_bugs-method-call.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 126a8c99f7943e0e70c191c97b233a112e6f77a9 Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Thu, 19 Jul 2018 12:43:03 +0100 -Subject: ARM: clean up per-processor check_bugs method call - -[ Upstream commit 945aceb1db8885d3a35790cf2e810f681db52756 ] - -Call the per-processor type check_bugs() method in the same way as we -do other per-processor functions - move the "processor." detail into -proc-fns.h. - -Reviewed-by: Julien Thierry -Signed-off-by: Russell King -Signed-off-by: Sasha Levin ---- - arch/arm/include/asm/proc-fns.h | 1 + - arch/arm/kernel/bugs.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h -index e25f4392e1b2..30c499146320 100644 ---- a/arch/arm/include/asm/proc-fns.h -+++ b/arch/arm/include/asm/proc-fns.h -@@ -99,6 +99,7 @@ extern void cpu_do_suspend(void *); - extern void cpu_do_resume(void *); - #else - #define cpu_proc_init processor._proc_init -+#define cpu_check_bugs processor.check_bugs - #define cpu_proc_fin processor._proc_fin - #define cpu_reset processor.reset - #define cpu_do_idle processor._do_idle -diff --git a/arch/arm/kernel/bugs.c b/arch/arm/kernel/bugs.c -index 7be511310191..d41d3598e5e5 100644 ---- a/arch/arm/kernel/bugs.c -+++ b/arch/arm/kernel/bugs.c -@@ -6,8 +6,8 @@ - void check_other_bugs(void) - { - #ifdef MULTI_CPU -- if (processor.check_bugs) -- processor.check_bugs(); -+ if (cpu_check_bugs) -+ cpu_check_bugs(); - #endif - } - --- -2.17.1 - diff --git a/queue-4.19/series b/queue-4.19/series index f0b40b71b02..42ffaf414dd 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -80,7 +80,6 @@ powerpc-io-fix-the-io-workarounds-code-to-work-with-.patch sched-fair-fix-cpu_util_wake-for-execl-type-workload.patch perf-x86-intel-uncore-add-more-imc-pci-ids-for-kabyl.patch arm-make-lookup_processor_type-non-__init.patch -arm-clean-up-per-processor-check_bugs-method-call.patch block-copy-ioprio-in-__bio_clone_fast-and-bounce.patch sunrpc-fix-a-bogus-get-put-in-generic_key_to_expire.patch riscv-add-missing-vdso_install-target.patch