From: Akinobu Mita <mita@miraclelinux.com>
Date: Thu, 28 Sep 2006 14:55:18 +0000 (+0200)
Subject: [S390] init task memory faults.
X-Git-Tag: v2.6.19-rc1~896
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bac9c66cd25e134077b284fc59bee6e5a8475d33;p=linux-2.6-omap-h63xx.git

[S390] init task memory faults.

Lock for mmap_sem is missing on page fault retry for init task
when it fails due to out of memory.

Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 44f0cda7e72..a393c308bb2 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -355,6 +355,7 @@ out_of_memory:
 	up_read(&mm->mmap_sem);
 	if (tsk->pid == 1) {
 		yield();
+		down_read(&mm->mmap_sem);
 		goto survive;
 	}
 	printk("VM: killing process %s\n", tsk->comm);