| From foo@baz Thu Feb 8 03:33:09 CET 2018 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Fri, 2 Feb 2018 22:39:23 +0100 |
| Subject: x86/pti: Mark constant arrays as __initconst |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| |
| (cherry picked from commit 4bf5d56d429cbc96c23d809a08f63cd29e1a702e) |
| |
| I'm seeing build failures from the two newly introduced arrays that |
| are marked 'const' and '__initdata', which are mutually exclusive: |
| |
| arch/x86/kernel/cpu/common.c:882:43: error: 'cpu_no_speculation' causes a section type conflict with 'e820_table_firmware_init' |
| arch/x86/kernel/cpu/common.c:895:43: error: 'cpu_no_meltdown' causes a section type conflict with 'e820_table_firmware_init' |
| |
| The correct annotation is __initconst. |
| |
| Fixes: fec9434a12f3 ("x86/pti: Do not enable PTI on CPUs which are not vulnerable to Meltdown") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
| Cc: Andy Lutomirski <luto@kernel.org> |
| Cc: Borislav Petkov <bp@suse.de> |
| Cc: Thomas Garnier <thgarnie@google.com> |
| Cc: David Woodhouse <dwmw@amazon.co.uk> |
| Link: https://lkml.kernel.org/r/20180202213959.611210-1-arnd@arndb.de |
| Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/kernel/cpu/common.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/x86/kernel/cpu/common.c |
| +++ b/arch/x86/kernel/cpu/common.c |
| @@ -861,7 +861,7 @@ static void identify_cpu_without_cpuid(s |
| #endif |
| } |
| |
| -static const __initdata struct x86_cpu_id cpu_no_speculation[] = { |
| +static const __initconst struct x86_cpu_id cpu_no_speculation[] = { |
| { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_CEDARVIEW, X86_FEATURE_ANY }, |
| { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_CLOVERVIEW, X86_FEATURE_ANY }, |
| { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_LINCROFT, X86_FEATURE_ANY }, |
| @@ -874,7 +874,7 @@ static const __initdata struct x86_cpu_i |
| {} |
| }; |
| |
| -static const __initdata struct x86_cpu_id cpu_no_meltdown[] = { |
| +static const __initconst struct x86_cpu_id cpu_no_meltdown[] = { |
| { X86_VENDOR_AMD }, |
| {} |
| }; |