git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
arch
/
m32r
/
mm
/
fault.c
diff --git
a/arch/m32r/mm/fault.c
b/arch/m32r/mm/fault.c
index
70a766a
..
4a71df4
100644
(file)
--- a/
arch/m32r/mm/fault.c
+++ b/
arch/m32r/mm/fault.c
@@
-271,7
+271,7
@@
no_context:
*/
out_of_memory:
up_read(&mm->mmap_sem);
- if (is_init(tsk)) {
+ if (is_
global_
init(tsk)) {
yield();
down_read(&mm->mmap_sem);
goto survive;