diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/m32r/kernel/smpboot.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/m32r/kernel/smpboot.c')
| -rw-r--r-- | arch/m32r/kernel/smpboot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index 2c03ac1d005f..fc2994811f15 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c | |||
| @@ -498,6 +498,8 @@ static void __init smp_online(void) | |||
| 498 | { | 498 | { |
| 499 | int cpu_id = smp_processor_id(); | 499 | int cpu_id = smp_processor_id(); |
| 500 | 500 | ||
| 501 | notify_cpu_starting(cpu_id); | ||
| 502 | |||
| 501 | local_irq_enable(); | 503 | local_irq_enable(); |
| 502 | 504 | ||
| 503 | /* Get our bogomips. */ | 505 | /* Get our bogomips. */ |