---

yaml --- r: 167721 b: refs/heads/master c: 92f7ba7 h: refs/heads/master i: 167719: a2c0bd1 v: v3
git-mirror · Oct 29, 2009 · 59b94bf · 59b94bf
1 parent acd58d5
commit 59b94bf
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: 2eca40a8ccd4160dbfaa5cbd61038d921d0e5f13
+refs/heads/master: 92f7ba70eecf4da8264a767b181cc2090f62d4ad
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>
@@ -661,7 +662,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;
 
 	if (!PageLRU(p))