From: Greg Kroah-Hartman Date: Fri, 30 Nov 2018 15:20:58 +0000 (+0100) Subject: drop arm-add-proc_vtable-and-proc_table-macros.patch from 4.14 and 4.19 X-Git-Tag: v4.19.6~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5544a6c3e3c88c4d73e1b1a7b69ca3a82b26d38;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-add-proc_vtable-and-proc_table-macros.patch from 4.14 and 4.19 --- diff --git a/queue-4.14/arm-add-proc_vtable-and-proc_table-macros.patch b/queue-4.14/arm-add-proc_vtable-and-proc_table-macros.patch deleted file mode 100644 index 6463d1dd275..00000000000 --- a/queue-4.14/arm-add-proc_vtable-and-proc_table-macros.patch +++ /dev/null @@ -1,109 +0,0 @@ -From f909a60412ccbb897e6d99a89e8fd631f6038bd4 Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Thu, 19 Jul 2018 12:17:38 +0100 -Subject: ARM: add PROC_VTABLE and PROC_TABLE macros - -[ Upstream commit e209950fdd065d2cc46e6338e47e52841b830cba ] - -Allow the way we access members of the processor vtable to be changed -at compile time. We will need to move to per-CPU vtables to fix the -Spectre variant 2 issues on big.Little systems. - -However, we have a couple of calls that do not need the vtable -treatment, and indeed cause a kernel warning due to the (later) use -of smp_processor_id(), so also introduce the PROC_TABLE macro for -these which always use CPU 0's function pointers. - -Reviewed-by: Julien Thierry -Signed-off-by: Russell King -Signed-off-by: Sasha Levin ---- - arch/arm/include/asm/proc-fns.h | 39 ++++++++++++++++++++++----------- - arch/arm/kernel/setup.c | 4 +--- - 2 files changed, 27 insertions(+), 16 deletions(-) - -diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h -index 30c499146320..c259cc49c641 100644 ---- a/arch/arm/include/asm/proc-fns.h -+++ b/arch/arm/include/asm/proc-fns.h -@@ -23,7 +23,7 @@ struct mm_struct; - /* - * Don't change this structure - ASM code relies on it. - */ --extern struct processor { -+struct processor { - /* MISC - * get data abort address/flags - */ -@@ -79,9 +79,13 @@ extern struct processor { - unsigned int suspend_size; - void (*do_suspend)(void *); - void (*do_resume)(void *); --} processor; -+}; - - #ifndef MULTI_CPU -+static inline void init_proc_vtable(const struct processor *p) -+{ -+} -+ - extern void cpu_proc_init(void); - extern void cpu_proc_fin(void); - extern int cpu_do_idle(void); -@@ -98,18 +102,27 @@ extern void cpu_reset(unsigned long addr, bool hvc) __attribute__((noreturn)); - 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 --#define cpu_dcache_clean_area processor.dcache_clean_area --#define cpu_set_pte_ext processor.set_pte_ext --#define cpu_do_switch_mm processor.switch_mm - --/* These three are private to arch/arm/kernel/suspend.c */ --#define cpu_do_suspend processor.do_suspend --#define cpu_do_resume processor.do_resume -+extern struct processor processor; -+#define PROC_VTABLE(f) processor.f -+#define PROC_TABLE(f) processor.f -+static inline void init_proc_vtable(const struct processor *p) -+{ -+ processor = *p; -+} -+ -+#define cpu_proc_init PROC_VTABLE(_proc_init) -+#define cpu_check_bugs PROC_VTABLE(check_bugs) -+#define cpu_proc_fin PROC_VTABLE(_proc_fin) -+#define cpu_reset PROC_VTABLE(reset) -+#define cpu_do_idle PROC_VTABLE(_do_idle) -+#define cpu_dcache_clean_area PROC_TABLE(dcache_clean_area) -+#define cpu_set_pte_ext PROC_TABLE(set_pte_ext) -+#define cpu_do_switch_mm PROC_VTABLE(switch_mm) -+ -+/* These two are private to arch/arm/kernel/suspend.c */ -+#define cpu_do_suspend PROC_VTABLE(do_suspend) -+#define cpu_do_resume PROC_VTABLE(do_resume) - #endif - - extern void cpu_resume(void); -diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index 8e9a3e40d949..753e26960e6f 100644 ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -686,9 +686,7 @@ static void __init setup_processor(void) - cpu_name = list->cpu_name; - __cpu_architecture = __get_cpu_architecture(); - --#ifdef MULTI_CPU -- processor = *list->proc; --#endif -+ init_proc_vtable(list->proc); - #ifdef MULTI_TLB - cpu_tlb = *list->tlb; - #endif --- -2.17.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 363d2faa545..02dcb995172 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -52,7 +52,6 @@ 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 -arm-add-proc_vtable-and-proc_table-macros.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-add-proc_vtable-and-proc_table-macros.patch b/queue-4.19/arm-add-proc_vtable-and-proc_table-macros.patch deleted file mode 100644 index 6bd69fc2c5b..00000000000 --- a/queue-4.19/arm-add-proc_vtable-and-proc_table-macros.patch +++ /dev/null @@ -1,109 +0,0 @@ -From f722f03e6fdb4b398ac743a1709789ef046a10ce Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Thu, 19 Jul 2018 12:17:38 +0100 -Subject: ARM: add PROC_VTABLE and PROC_TABLE macros - -[ Upstream commit e209950fdd065d2cc46e6338e47e52841b830cba ] - -Allow the way we access members of the processor vtable to be changed -at compile time. We will need to move to per-CPU vtables to fix the -Spectre variant 2 issues on big.Little systems. - -However, we have a couple of calls that do not need the vtable -treatment, and indeed cause a kernel warning due to the (later) use -of smp_processor_id(), so also introduce the PROC_TABLE macro for -these which always use CPU 0's function pointers. - -Reviewed-by: Julien Thierry -Signed-off-by: Russell King -Signed-off-by: Sasha Levin ---- - arch/arm/include/asm/proc-fns.h | 39 ++++++++++++++++++++++----------- - arch/arm/kernel/setup.c | 4 +--- - 2 files changed, 27 insertions(+), 16 deletions(-) - -diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h -index 30c499146320..c259cc49c641 100644 ---- a/arch/arm/include/asm/proc-fns.h -+++ b/arch/arm/include/asm/proc-fns.h -@@ -23,7 +23,7 @@ struct mm_struct; - /* - * Don't change this structure - ASM code relies on it. - */ --extern struct processor { -+struct processor { - /* MISC - * get data abort address/flags - */ -@@ -79,9 +79,13 @@ extern struct processor { - unsigned int suspend_size; - void (*do_suspend)(void *); - void (*do_resume)(void *); --} processor; -+}; - - #ifndef MULTI_CPU -+static inline void init_proc_vtable(const struct processor *p) -+{ -+} -+ - extern void cpu_proc_init(void); - extern void cpu_proc_fin(void); - extern int cpu_do_idle(void); -@@ -98,18 +102,27 @@ extern void cpu_reset(unsigned long addr, bool hvc) __attribute__((noreturn)); - 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 --#define cpu_dcache_clean_area processor.dcache_clean_area --#define cpu_set_pte_ext processor.set_pte_ext --#define cpu_do_switch_mm processor.switch_mm - --/* These three are private to arch/arm/kernel/suspend.c */ --#define cpu_do_suspend processor.do_suspend --#define cpu_do_resume processor.do_resume -+extern struct processor processor; -+#define PROC_VTABLE(f) processor.f -+#define PROC_TABLE(f) processor.f -+static inline void init_proc_vtable(const struct processor *p) -+{ -+ processor = *p; -+} -+ -+#define cpu_proc_init PROC_VTABLE(_proc_init) -+#define cpu_check_bugs PROC_VTABLE(check_bugs) -+#define cpu_proc_fin PROC_VTABLE(_proc_fin) -+#define cpu_reset PROC_VTABLE(reset) -+#define cpu_do_idle PROC_VTABLE(_do_idle) -+#define cpu_dcache_clean_area PROC_TABLE(dcache_clean_area) -+#define cpu_set_pte_ext PROC_TABLE(set_pte_ext) -+#define cpu_do_switch_mm PROC_VTABLE(switch_mm) -+ -+/* These two are private to arch/arm/kernel/suspend.c */ -+#define cpu_do_suspend PROC_VTABLE(do_suspend) -+#define cpu_do_resume PROC_VTABLE(do_resume) - #endif - - extern void cpu_resume(void); -diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index 4c249cb261f3..6b9d191da868 100644 ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -686,9 +686,7 @@ static void __init setup_processor(void) - cpu_name = list->cpu_name; - __cpu_architecture = __get_cpu_architecture(); - --#ifdef MULTI_CPU -- processor = *list->proc; --#endif -+ init_proc_vtable(list->proc); - #ifdef MULTI_TLB - cpu_tlb = *list->tlb; - #endif --- -2.17.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 120d685b0b7..f0b40b71b02 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -81,7 +81,6 @@ 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 -arm-add-proc_vtable-and-proc_table-macros.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