diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
| commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
| tree | db3d7519932549bf528f5b8e4cb8350356cd544d /arch/sh/kernel/smp.c | |
| parent | 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Diffstat (limited to 'arch/sh/kernel/smp.c')
| -rw-r--r-- | arch/sh/kernel/smp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index c55d314166c7..508dfb023628 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c | |||
| @@ -82,6 +82,8 @@ asmlinkage void __cpuinit start_secondary(void) | |||
| 82 | 82 | ||
| 83 | preempt_disable(); | 83 | preempt_disable(); |
| 84 | 84 | ||
| 85 | notify_cpu_starting(smp_processor_id()); | ||
| 86 | |||
| 85 | local_irq_enable(); | 87 | local_irq_enable(); |
| 86 | 88 | ||
| 87 | cpu = smp_processor_id(); | 89 | cpu = smp_processor_id(); |