]> git.baikalelectronics.ru Git - kernel.git/commit
x86/pti: Mark constant arrays as __initconst
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Feb 2018 21:39:23 +0000 (22:39 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 2 Feb 2018 22:13:56 +0000 (23:13 +0100)
commit68fc833e890aa464f246cee9d2fe997092decd9a
tree34bad6ef66c87ace089d444a22848ba5793c676b
parentaf37d29d1d52e2db111427e4d0f63ebfdc24f4bd
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.

Fixes: ec388351e99c ("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
arch/x86/kernel/cpu/common.c