x86/pti: mark constant arrays as __initconst
PATCH 1/1 x86/pti: mark constant arrays as __initconst
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.
--- arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/common.c +2 -2
@@ -879,7 +879,7 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)#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 },
@@ -892,7 +892,7 @@ static const __initdata struct x86_cpu_id cpu_no_speculation[] = { {} }; -static const __initdata struct x86_cpu_id cpu_no_meltdown[] = { +static const __initconst struct x86_cpu_id cpu_no_meltdown[] = { {X86_VENDOR_AMD }, {} };
Signature · 1 line
2.9.0
tip-bot for Arnd Bergmann
merge bot[tip:x86/pti] x86/pti: Mark constant arrays as __initconst
x86/pti: Mark constant arrays as __initconst
Commit-ID: 4bf5d56d429cbc96c23d809a08f63cd29e1a702e Gitweb: https://git.kernel.org/tip/4bf5d56d429cbc96c23d809a08f63cd29e1a702e Author: Arnd Bergmann <[email protected]> AuthorDate: Fri, 2 Feb 2018 22:39:23 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 2 Feb 2018 23:13:56 +0100
x86/pti: Mark constant arrays as __initconst
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.
--- arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/common.c +2 -2
@@ -900,7 +900,7 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)#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 },
@@ -913,7 +913,7 @@ static const __initdata struct x86_cpu_id cpu_no_speculation[] = { {} }; -static const __initdata struct x86_cpu_id cpu_no_meltdown[] = { +static const __initconst struct x86_cpu_id cpu_no_meltdown[] = { {X86_VENDOR_AMD }, {} };