From dadf5d2fa4e050f2652d01bf3a28d2b60a888060 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Mon, 9 Aug 2010 17:19:02 -0700
Subject: [PATCH] --- yaml --- r: 207226 b: refs/heads/master c:
 67a8a20fe1eec43ebfa7f2b83e988dbdb4c16271 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/avr32/mm/fault.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 4beee282cdf5..ef16c8bb7582 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596d7cfa2be6284512915609f01b7fe2f4df5d02
+refs/heads/master: 67a8a20fe1eec43ebfa7f2b83e988dbdb4c16271
diff --git a/trunk/arch/avr32/mm/fault.c b/trunk/arch/avr32/mm/fault.c
index b61d86d3debf..f7040a1e399f 100644
--- a/trunk/arch/avr32/mm/fault.c
+++ b/trunk/arch/avr32/mm/fault.c
@@ -132,7 +132,6 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
 	 * sure we exit gracefully rather than endlessly redo the
 	 * fault.
 	 */
-survive:
 	fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0);
 	if (unlikely(fault & VM_FAULT_ERROR)) {
 		if (fault & VM_FAULT_OOM)
@@ -211,15 +210,10 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
 	 */
 out_of_memory:
 	up_read(&mm->mmap_sem);
-	if (is_global_init(current)) {
-		yield();
-		down_read(&mm->mmap_sem);
-		goto survive;
-	}
-	printk("VM: Killing process %s\n", tsk->comm);
-	if (user_mode(regs))
-		do_group_exit(SIGKILL);
-	goto no_context;
+	pagefault_out_of_memory();
+	if (!user_mode(regs))
+		goto no_context;
+	return;
 
 do_sigbus:
 	up_read(&mm->mmap_sem);