Patch "x86/pti: Mark constant arrays as __initconst" has been added to the 4.15-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
x86/pti: Mark constant arrays as __initconst
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86pti_Mark_constant_arrays_as___initconst.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Subject: x86/pti: Mark constant arrays as __initconst
From: Arnd Bergmann [email protected]
Date: Fri Feb 2 22:39:23 2018 +0100
From: Arnd Bergmann [email protected]
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.
--- 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(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 },
@@ -913,7 +913,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 }, {} };
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/x86pti_Mark_constant_arrays_as___initconst.patch queue-4.15/auxdisplay-img-ascii-lcd-add-missing-module_description-author-license.patch