diff --git a/[refs] b/[refs]
index fcb86af50cbd..e7fe4c20d667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a70caa8ba48f21f46d3b4e71b6b8d14080bbd57a
+refs/heads/master: d99be1a8ecf377c2c9b3372d36411ad6547bbd4c
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 543c446bf4ed..1c9dc46da3db 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2527,7 +2527,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 			ret = VM_FAULT_HWPOISON;
 		} else {
 			print_bad_pte(vma, address, orig_pte, NULL);
-			ret = VM_FAULT_OOM;
+			ret = VM_FAULT_SIGBUS;
 		}
 		goto out;
 	}
@@ -2923,7 +2923,7 @@ static int do_nonlinear_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 		 * Page table corrupted: show pte and kill process.
 		 */
 		print_bad_pte(vma, address, orig_pte, NULL);
-		return VM_FAULT_OOM;
+		return VM_FAULT_SIGBUS;
 	}
 
 	pgoff = pte_to_pgoff(orig_pte);