---

yaml --- r: 167853 b: refs/heads/master c: 01e00f8 h: refs/heads/master i: 167851: 24175a7 v: v3
git-mirror · Oct 19, 2009 · 993d59c · 993d59c
1 parent 33d1546
commit 993d59c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4779cb31c0ee3b355116745edca3f3e5fe865553
+refs/heads/master: 01e00f880ca700376e1845cf7a2524ebe68e47d6
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
@@ -35,6 +35,7 @@
 #include <linux/mm.h>
 #include <linux/page-flags.h>
 #include <linux/sched.h>
+#include <linux/ksm.h>
 #include <linux/rmap.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
@@ -644,7 +645,7 @@ static void hwpoison_user_mappings(struct page *p, unsigned long pfn,
 	int i;
 	int kill = 1;
 
-	if (PageReserved(p) || PageCompound(p) || PageSlab(p))
+	if (PageReserved(p) || PageCompound(p) || PageSlab(p) || PageKsm(p))
 		return;
 
 	/*