---

yaml
---
r: 198559
b: refs/heads/master
c: 1cb3d8e
h: refs/heads/master
i:
  198557: c863b5c
  198555: 38d7088
  198551: 8b8aa6d
  198543: 429f6e7
  198527: a20d39d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ce34c8f4466608bc67630a42d04f4aaf0443d9b
+refs/heads/master: 1cb3d8e2c8d30d2cbfe42b696d501d0a016edec1

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