diff options
Diffstat (limited to 'arch/m32r')
-rw-r--r-- | arch/m32r/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/m32r/kernel/smpboot.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index ea13a8f4d8b0..cc4b571e5db7 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
@@ -104,7 +104,9 @@ void cpu_idle (void) | |||
104 | 104 | ||
105 | idle(); | 105 | idle(); |
106 | } | 106 | } |
107 | preempt_enable_no_resched(); | ||
107 | schedule(); | 108 | schedule(); |
109 | preempt_disable(); | ||
108 | } | 110 | } |
109 | } | 111 | } |
110 | 112 | ||
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) | |||
426 | int __init start_secondary(void *unused) | 426 | int __init start_secondary(void *unused) |
427 | { | 427 | { |
428 | cpu_init(); | 428 | cpu_init(); |
429 | preempt_disable(); | ||
429 | smp_callin(); | 430 | smp_callin(); |
430 | while (!cpu_isset(smp_processor_id(), smp_commenced_mask)) | 431 | while (!cpu_isset(smp_processor_id(), smp_commenced_mask)) |
431 | cpu_relax(); | 432 | cpu_relax(); |