From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 8 Dec 2006 14:53:49 +0000 (+0100)
Subject: [S390] uaccess_pt: add missing down_read() and convert to is_init().
X-Git-Tag: v2.6.20-rc1~34^2~31^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=22155914b66b348b7113a0b3baf96a72bd3f643d;p=linux-2.6-omap-h63xx.git

[S390] uaccess_pt: add missing down_read() and convert to is_init().

Doesn't seem to be a good idea to duplicate code :)

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 8741bdc0929..633249c3ba9 100644
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
@@ -8,8 +8,8 @@
  */
 
 #include <linux/errno.h>
-#include <asm/uaccess.h>
 #include <linux/mm.h>
+#include <asm/uaccess.h>
 #include <asm/futex.h>
 
 static inline int __handle_fault(struct mm_struct *mm, unsigned long address,
@@ -60,8 +60,9 @@ out:
 
 out_of_memory:
 	up_read(&mm->mmap_sem);
-	if (current->pid == 1) {
+	if (is_init(current)) {
 		yield();
+		down_read(&mm->mmap_sem);
 		goto survive;
 	}
 	printk("VM: killing process %s\n", current->comm);