diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /arch/mips/kernel/process.c | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/kernel/process.c')
| -rw-r--r-- | arch/mips/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 4fe3d5715c41..dd725779d91f 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
| @@ -52,7 +52,9 @@ ATTRIB_NORET void cpu_idle(void) | |||
| 52 | while (!need_resched()) | 52 | while (!need_resched()) |
| 53 | if (cpu_wait) | 53 | if (cpu_wait) |
| 54 | (*cpu_wait)(); | 54 | (*cpu_wait)(); |
| 55 | preempt_enable_no_resched(); | ||
| 55 | schedule(); | 56 | schedule(); |
| 57 | preempt_disable(); | ||
| 56 | } | 58 | } |
| 57 | } | 59 | } |
| 58 | 60 | ||
