|
@@ -988,8 +988,7 @@ void setup_secondary_APIC_clock(void)
|
|
*/
|
|
*/
|
|
static void local_apic_timer_interrupt(void)
|
|
static void local_apic_timer_interrupt(void)
|
|
{
|
|
{
|
|
- int cpu = smp_processor_id();
|
|
|
|
- struct clock_event_device *evt = &per_cpu(lapic_events, cpu);
|
|
|
|
|
|
+ struct clock_event_device *evt = this_cpu_ptr(&lapic_events);
|
|
|
|
|
|
/*
|
|
/*
|
|
* Normally we should not be here till LAPIC has been initialized but
|
|
* Normally we should not be here till LAPIC has been initialized but
|
|
@@ -1003,7 +1002,8 @@ static void local_apic_timer_interrupt(void)
|
|
* spurious.
|
|
* spurious.
|
|
*/
|
|
*/
|
|
if (!evt->event_handler) {
|
|
if (!evt->event_handler) {
|
|
- pr_warning("Spurious LAPIC timer interrupt on cpu %d\n", cpu);
|
|
|
|
|
|
+ pr_warning("Spurious LAPIC timer interrupt on cpu %d\n",
|
|
|
|
+ smp_processor_id());
|
|
/* Switch it off */
|
|
/* Switch it off */
|
|
lapic_timer_shutdown(evt);
|
|
lapic_timer_shutdown(evt);
|
|
return;
|
|
return;
|