Skip to contentSkip to conversation

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

S390 Martin Schwidefsky 1 participant 1 message Dec 8, 2006 s390

lore
Share & tools
lore
#0 lore raw

From: Heiko Carstens <[email protected]>

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

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

---

 arch/s390/lib/uaccess_pt.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
arch/s390/lib/uaccess_pt.c +3 -2
diff -urpN linux-2.6/arch/s390/lib/uaccess_pt.c linux-2.6-patched/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);