Commit-ID: ef34cc3428a716f86ee72aa5a37fa6c0025e4363
Gitweb: http://git.kernel.org/tip/ef34cc3428a716f86ee72aa5a37fa6c0025e4363
Author: Daniel J Blueman <daniel@xxxxxxxxxxxxx>
AuthorDate: Wed, 23 Sep 2015 09:38:13 +0800
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Wed, 23 Sep 2015 05:39:20 +0200
x86/numachip: Fix timer build conflict
Fix Numachip build conflict from:
ce2e572 x86/numachip: Introduce Numachip2 timer mechanisms
drivers/built-in.o:(.discard+0x1b): multiple definition of `__pcpu_unique_cpu_ced'
arch/x86/built-in.o:(.discard+0xa0da): first defined here
Ensure cpu_ced is unique by prefixing with 'numachip2'.
Signed-off-by: Daniel J Blueman <daniel@xxxxxxxxxxxxx>
Cc: <tipbuild@xxxxxxxxx>
Cc: <kbuild-all@xxxxxx>
Cc: Steffen Persvold <sp@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
drivers/clocksource/numachip.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/clocksource/numachip.c b/drivers/clocksource/numachip.c
index 088e5fa..4e0f11f 100644
--- a/drivers/clocksource/numachip.c
+++ b/drivers/clocksource/numachip.c
@@ -19,7 +19,7 @@
#include <asm/numachip/numachip.h>
#include <asm/numachip/numachip_csr.h>
-static DEFINE_PER_CPU(struct clock_event_device, cpu_ced);
+static DEFINE_PER_CPU(struct clock_event_device, numachip2_ced);
static cycles_t numachip2_timer_read(struct clocksource *cs)
{
@@ -56,7 +56,7 @@ static struct clock_event_device numachip2_clockevent = {
static void numachip_timer_interrupt(void)
{
- struct clock_event_device *ced = this_cpu_ptr(&cpu_ced);
+ struct clock_event_device *ced = this_cpu_ptr(&numachip2_ced);
ced->event_handler(ced);
}
@@ -64,7 +64,7 @@ static void numachip_timer_interrupt(void)
static __init void numachip_timer_each(struct work_struct *work)
{
unsigned local_apicid = __this_cpu_read(x86_cpu_to_apicid) & 0xff;
- struct clock_event_device *ced = this_cpu_ptr(&cpu_ced);
+ struct clock_event_device *ced = this_cpu_ptr(&numachip2_ced);
/* Setup IPI vector to local core and relative timing mode */
numachip2_write64_lcsr(NUMACHIP2_TIMER_INT + numachip2_timer(),
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|