x86/pti: Mark constant arrays as __initconst
Arnd Bergmann authored
commit 4bf5d56d

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: fec9434a

 ("x86/pti: Do not enable PTI on CPUs which are not vulnerable to Meltdown")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarThomas 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: Greg Kroa...
d13d4d2a
Name Last commit Last update
Documentation x86/paravirt: Remove 'noreplace-paravirt' cmdline option
arch x86/pti: Mark constant arrays as __initconst
block block: drain queue before waiting for q_usage_counter becoming zero
certs License cleanup: add SPDX GPL-2.0 license identifier to files with no license
crypto crypto: af_alg - whitelist mask and type
drivers pinctrl: pxa: pxa2xx: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
firmware kbuild: remove all dummy assignments to obj-
fs orangefs: fix deadlock; do not write i_size in read_iter
include x86/retpoline: Avoid retpolines for built-in __init functions
init Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
ipc Rename superblock flags (MS_xyz -> SB_xyz)
kernel module/retpoline: Warn about missing retpoline in module
lib test_firmware: fix missing unlock on error in config_num_requests_store()
mm mm, page_vma_mapped: Introduce pfn_in_hpage()
net nl80211: Sanitize array index in parse_txq_params
samples Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
scripts module/retpoline: Warn about missing retpoline in module
security ima/policy: fix parsing of fsuuid
sound ASoC: pcm512x: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
tools objtool: Warn on stripped section symbol
usr initramfs: fix initramfs rebuilds w/ compression after disabling
virt Merge tag 'kvm-arm-fixes-for-v4.15-3-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
.cocciconfig scripts: add Linux .cocciconfig for coccinelle
.get_maintainer.ignore Add hch to .get_maintainer.ignore
.gitattributes .gitattributes: set git diff driver for C source code files
.gitignore
.mailmap
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS
Makefile
README
Linux kernel
============

This file was moved to Documentation/admin-guide/README.rst

Please notice that there are several guides for kernel developers and users.
These guides can be rendered in a number of formats, like HTML and PDF.

In order to build the documentation, use ``make htmldocs`` or
``make pdfdocs``.

There are various text files in the Documentation/ subdirectory,
several of them using the Restructured Text markup notation.
See Documentation/00-INDEX for a list of what is contained in each file.

Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.