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@numascale.com>
Cc: <tipbuild@zytor.com>
Cc: <kbuild-all@01.org>
Cc: Steffen Persvold <sp@numascale.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/clocksource/numachip.c b/drivers/clocksource/numachip.c
index 088e5fac8b3f9b65f2a601ef1051edf2907403ff..4e0f11fd26171f63b84b356e766b3a00e280af5e 100644 (file)
--- 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(),