summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorAndi Kleen2014-09-24 06:32:19 +0200
committerThomas Gleixner2014-10-08 11:18:49 +0200
commit2dee5c43da3a981489a4f18972827139afcbee82 (patch)
tree50c12064c39433b5b57c90636fcc95d11c1701f2 /arch/x86/kernel
parentx86: Reject x32 executables if x32 ABI not supported (diff)
downloadkernel-qcow2-linux-2dee5c43da3a981489a4f18972827139afcbee82.tar.gz
kernel-qcow2-linux-2dee5c43da3a981489a4f18972827139afcbee82.tar.xz
kernel-qcow2-linux-2dee5c43da3a981489a4f18972827139afcbee82.zip
x86: Fix section conflict for numachip
A variable cannot be both __read_mostly and const. This is a meaningless combination. Just make it only const. This fixes the LTO build with numachip enabled. Signed-off-by: Andi Kleen <ak@linux.intel.com> Link: http://lkml.kernel.org/r/1411533139-25708-1-git-send-email-andi@firstfloor.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/apic/apic_numachip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index ae915391ebec..4128b5fcb559 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -32,7 +32,7 @@
static int numachip_system __read_mostly;
-static const struct apic apic_numachip __read_mostly;
+static const struct apic apic_numachip;
static unsigned int get_apic_id(unsigned long x)
{