diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 08:18:25 +0300 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 08:18:25 +0300 |
commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /arch/m32r/kernel/smpboot.c | |
parent | 7301c8d3a05dc52d33598364da7c4eb6ab6357eb (diff) | |
parent | 811803c5572b296e0031e0099203de90d77c7bcf (diff) | |
download | linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.tar.xz |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/m32r/kernel/smpboot.c')
-rw-r--r-- | arch/m32r/kernel/smpboot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index 640d592ea072..b90c54169fa5 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c @@ -426,6 +426,7 @@ void __init smp_cpus_done(unsigned int max_cpus) int __init start_secondary(void *unused) { cpu_init(); + preempt_disable(); smp_callin(); while (!cpu_isset(smp_processor_id(), smp_commenced_mask)) cpu_relax(); |