From 5431284ff47d3e9a462f7f06c1c632f004ce2a4b Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Date: Mon, 14 Dec 2009 17:59:04 -0800
Subject: [PATCH] --- yaml --- r: 176275 b: refs/heads/master c:
 d99be1a8ecf377c2c9b3372d36411ad6547bbd4c h: refs/heads/master i:   176273:
 3a94f480373a110589ec1e1572a9a4ba3f5f0d93   176271:
 ee465726bb53820c194fe6957d64b36a8ca3d32e v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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);