aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/smp.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 11:53:45 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 11:53:45 +0100
commit1eecb8280b038019f2f914abc01b28caf5d0a168 (patch)
tree7efa7cfc60b64ce50d437342d6457211effbb0ea /arch/x86/xen/smp.c
parentc2f6702d318e43bf841da9c0ba5b6f1695661bbc (diff)
parent0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff)
downloadkernel_goldelico_gta04-1eecb8280b038019f2f914abc01b28caf5d0a168.zip
kernel_goldelico_gta04-1eecb8280b038019f2f914abc01b28caf5d0a168.tar.gz
kernel_goldelico_gta04-1eecb8280b038019f2f914abc01b28caf5d0a168.tar.bz2
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of an export for regcache_sync_region().
Diffstat (limited to 'arch/x86/xen/smp.c')
-rw-r--r--arch/x86/xen/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 02900e8..5fac691 100644
--- a/arch/x86/xen/smp.c
+++ b/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();