diff options
| author | Daniel J Blueman <daniel@numascale.com> | 2015-09-23 09:38:13 +0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-09-23 05:39:20 +0200 |
| commit | ef34cc3428a716f86ee72aa5a37fa6c0025e4363 (patch) | |
| tree | 66a322a896f42264d11259687c58fa9bc88bde1b /drivers/clocksource | |
| parent | ce2e572cfe7b2fc3f0e9da4aa7bc61a2c2c51fc7 (diff) | |
| download | linux-ef34cc3428a716f86ee72aa5a37fa6c0025e4363.tar.gz linux-ef34cc3428a716f86ee72aa5a37fa6c0025e4363.tar.bz2 linux-ef34cc3428a716f86ee72aa5a37fa6c0025e4363.zip | |
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>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/numachip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clocksource/numachip.c b/drivers/clocksource/numachip.c index 088e5fac8b3f..4e0f11fd2617 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(), |