diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
| commit | c493756e2a8a78bcaae30668317890dcfe86e7c3 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/x86/mach-voyager/voyager_smp.c | |
| parent | 0d15504f16f68725e4635aa85411015d1c573b0a (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/x86/mach-voyager/voyager_smp.c')
| -rw-r--r-- | arch/x86/mach-voyager/voyager_smp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index ee0fba092157..199a5f4a873c 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
| @@ -448,6 +448,8 @@ static void __init start_secondary(void *unused) | |||
| 448 | 448 | ||
| 449 | VDEBUG(("VOYAGER SMP: CPU%d, stack at about %p\n", cpuid, &cpuid)); | 449 | VDEBUG(("VOYAGER SMP: CPU%d, stack at about %p\n", cpuid, &cpuid)); |
| 450 | 450 | ||
| 451 | notify_cpu_starting(cpuid); | ||
| 452 | |||
| 451 | /* enable interrupts */ | 453 | /* enable interrupts */ |
| 452 | local_irq_enable(); | 454 | local_irq_enable(); |
| 453 | 455 | ||