diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 17:25:50 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 15:41:02 (GMT) |
| commit | e481fcf8563d300e7f8875cae5fdc41941d29de0 (patch) | |
| tree | 17e5199c88bcc9b73faa4a487b2caf2532f4b8b1 | |
| parent | ac60aae561fff99d38beba82d84277b12437c05e (diff) | |
| download | linux-fsl-qoriq-e481fcf8563d300e7f8875cae5fdc41941d29de0.tar.xz | |
x86: calibrate delay with irqs enabled
We do it to make it close to x86_64. The later needs it,
otherwise the nmi watchdog can get into the scene and kill us
with a hammer.
Enabling irqs here used to trigger a bug in i386. This is because
time irq handling relies upon structures that are only initialized
after smp initcalls (More precisely, it will find
per_cpu(hrtimer_bases, cpu)->cb_pending list not initialized and crash)
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/smpboot_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index dbfaeb3..bd2f886 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/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); /* |