diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
| commit | 31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch) | |
| tree | a6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /arch/sh/kernel/smp.c | |
| parent | fca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff) | |
| parent | 6730c3c14421b7c924d06e31bb66e0adad225547 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/sh/kernel/smp.c')
| -rw-r--r-- | arch/sh/kernel/smp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index 5ecefc02896a..59e49b18252c 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c @@ -112,7 +112,9 @@ int __cpu_up(unsigned int cpu) int start_secondary(void *unused) { - unsigned int cpu = smp_processor_id(); + unsigned int cpu; + + cpu = smp_processor_id(); atomic_inc(&init_mm.mm_count); current->active_mm = &init_mm; @@ -120,6 +122,7 @@ int start_secondary(void *unused) smp_store_cpu_info(cpu); __smp_slave_init(cpu); + preempt_disable(); per_cpu_trap_init(); atomic_inc(&cpus_booted); |