diff --git a/[refs] b/[refs] index 1da41881bbdc..9624d38c3312 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac60aae561fff99d38beba82d84277b12437c05e +refs/heads/master: e481fcf8563d300e7f8875cae5fdc41941d29de0 diff --git a/trunk/arch/x86/kernel/smpboot_32.c b/trunk/arch/x86/kernel/smpboot_32.c index dbfaeb30a69a..bd2f8863efa2 100644 --- a/trunk/arch/x86/kernel/smpboot_32.c +++ b/trunk/arch/x86/kernel/smpboot_32.c @@ -167,7 +167,9 @@ static void __cpuinit smp_callin(void) /* * Get our bogomips. */ + local_irq_enable(); calibrate_delay(); + local_irq_disable(); Dprintk("Stack at about %p\n",&cpuid); /*