Skip to contentSkip to conversation

x86: Fix section conflict for numachip

PATCH New Andi Kleen 2 participants 2 messages Sep 24, 2014 – Oct 8, 2014 x86

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 x86: Fix section conflict for numachip

From: Andi Kleen <[email protected]>

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.

---
 arch/x86/kernel/apic/apic_numachip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/apic_numachip.c +1 -1
index a5b45df..2f8be54 100644
@@ -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)
 {
Signature · 1 line
2.1.0
#1 lore raw
x86: Fix section conflict for numachip
Commit-ID:  2dee5c43da3a981489a4f18972827139afcbee82
Gitweb:     http://git.kernel.org/tip/2dee5c43da3a981489a4f18972827139afcbee82
Author:     Andi Kleen <[email protected]>
AuthorDate: Wed, 24 Sep 2014 06:32:19 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 8 Oct 2014 11:18:49 +0200

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.

---
 arch/x86/kernel/apic/apic_numachip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/apic_numachip.c +1 -1
index ae91539..4128b5f 100644
@@ -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)
 {