projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[powerpc.git]
/
arch
/
cris
/
kernel
/
process.c
diff --git
a/arch/cris/kernel/process.c
b/arch/cris/kernel/process.c
index
949a0e4
..
7c80afb
100644
(file)
--- a/
arch/cris/kernel/process.c
+++ b/
arch/cris/kernel/process.c
@@
-218,7
+218,9
@@
void cpu_idle (void)
idle = default_idle;
idle();
}
+ preempt_enable_no_resched();
schedule();
+ preempt_disable();
}
}