From 5924ea2f15b5c3726b1d8e5aed3fc95e3d7b3d9c Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Thu, 29 Apr 2010 17:48:18 -0400
Subject: [PATCH] --- yaml --- r: 198559 b: refs/heads/master c:
 1cb3d8e2c8d30d2cbfe42b696d501d0a016edec1 h: refs/heads/master i:   198557:
 c863b5c16bbd5930dc28b669e966a2c38f829e70   198555:
 38d70880bdf323cebdfc1deb8273a72f75976a82   198551:
 8b8aa6dcf83579a52c0665b0afb98162f4d479f2   198543:
 429f6e70ecf8bb553d2efb87e79f779efa5be2c4   198527:
 a20d39da7eb988844403d5b6ccb0fac2617e6356 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/alpha/mm/fault.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d5e0c80f48a0..8e1e2aad41cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ce34c8f4466608bc67630a42d04f4aaf0443d9b
+refs/heads/master: 1cb3d8e2c8d30d2cbfe42b696d501d0a016edec1
diff --git a/trunk/arch/alpha/mm/fault.c b/trunk/arch/alpha/mm/fault.c
index 00a31deaa96e..fadd5f882ff9 100644
--- a/trunk/arch/alpha/mm/fault.c
+++ b/trunk/arch/alpha/mm/fault.c
@@ -142,7 +142,6 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 			goto bad_area;
 	}
 
- survive:
 	/* If for any reason at all we couldn't handle the fault,
 	   make sure we exit gracefully rather than endlessly redo
 	   the fault.  */
@@ -188,16 +187,10 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 	/* We ran out of memory, or some other thing happened to us that
 	   made us unable to handle the page fault gracefully.  */
  out_of_memory:
-	if (is_global_init(current)) {
-		yield();
-		down_read(&mm->mmap_sem);
-		goto survive;
-	}
-	printk(KERN_ALERT "VM: killing process %s(%d)\n",
-	       current->comm, task_pid_nr(current));
 	if (!user_mode(regs))
 		goto no_context;
-	do_group_exit(SIGKILL);
+	pagefault_out_of_memory();
+	return;
 
  do_sigbus:
 	/* Send a sigbus, regardless of whether we were in kernel