x86/pti: Mark constant arrays as __initconst
authorArnd Bergmann <[email protected]>
Fri, 2 Feb 2018 21:39:23 +0000 (22:39 +0100)
committerThomas Gleixner <[email protected]>
Fri, 2 Feb 2018 22:13:56 +0000 (23:13 +0100)
commit4bf5d56d429cbc96c23d809a08f63cd29e1a702e
tree34bad6ef66c87ace089d444a22848ba5793c676b
parent9005c6834c0ffdfe46afa76656bd9276cca864f6
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: fec9434a12f3 ("x86/pti: Do not enable PTI on CPUs which are not vulnerable to Meltdown")
Signed-off-by: Arnd Bergmann <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Ricardo Neri <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Thomas Garnier <[email protected]>
Cc: David Woodhouse <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
arch/x86/kernel/cpu/common.c