diff --git a/[refs] b/[refs] index a6ac5b4db93e..9286090a1b10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2531d64b6fe2724dc432b67d8dc66bd45621da0b +refs/heads/master: e8c9e788f493d3236809e955c9fc12625a461e09 diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c index 240def438dc3..e845555ff486 100644 --- a/trunk/arch/x86/xen/smp.c +++ b/trunk/arch/x86/xen/smp.c @@ -59,7 +59,7 @@ static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id) static void __cpuinit cpu_bringup(void) { - int cpu = smp_processor_id(); + int cpu; cpu_init(); touch_softlockup_watchdog();