---

yaml
---
r: 196629
b: refs/heads/master
c: e460c2c
h: refs/heads/master
i:
  196627: f9f2b5a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91eea67c6d8704396a98226508c56a8501e141e3
+refs/heads/master: e460c2c91af44374cbfa3f1c70f5ca9bbf099aa9

trunk/arch/powerpc/mm/fault.c

@@ -308,7 +308,6 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
 	 * make sure we exit gracefully rather than endlessly redo
 	 * the fault.
 	 */
- survive:
 	ret = handle_mm_fault(mm, vma, address, is_write ? FAULT_FLAG_WRITE : 0);
 	if (unlikely(ret & VM_FAULT_ERROR)) {
 		if (ret & VM_FAULT_OOM)
@@ -360,15 +359,10 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
  */
 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", current->comm);
-	if (user_mode(regs))
-		do_group_exit(SIGKILL);
-	return SIGKILL;
+	if (!user_mode(regs))
+		return SIGKILL;
+	pagefault_out_of_memory();
+	return 0;
 
 do_sigbus:
 	up_read(&mm->mmap_sem);