[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2dee5c43da3a981489a4f18972827139afcbee82@git.kernel.org>
Date: Wed, 8 Oct 2014 02:21:45 -0700
From: tip-bot for Andi Kleen <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
andi@...stfloor.org, ak@...ux.intel.com, tglx@...utronix.de
Subject: [tip:x86/urgent] x86: Fix section conflict for numachip
Commit-ID: 2dee5c43da3a981489a4f18972827139afcbee82
Gitweb: http://git.kernel.org/tip/2dee5c43da3a981489a4f18972827139afcbee82
Author: Andi Kleen <andi@...stfloor.org>
AuthorDate: Wed, 24 Sep 2014 06:32:19 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
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.
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
Link: http://lkml.kernel.org/r/1411533139-25708-1-git-send-email-andi@firstfloor.org
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/x86/kernel/apic/apic_numachip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index ae91539..4128b5f 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)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists