From 59b94bfe3dd8c4a8f9b77c06d9e3fae44403f511 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Date: Mon, 26 Oct 2009 16:49:31 -0700
Subject: [PATCH] --- yaml --- r: 167721 b: refs/heads/master c:
 92f7ba70eecf4da8264a767b181cc2090f62d4ad h: refs/heads/master i:   167719:
 a2c0bd1c6160a4343bf8b08a938e395eb9476228 v: v3

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

diff --git a/[refs] b/[refs]
index 536490daa952..1575806ad054 100644
--- 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
index 729d4b15b645..7fc2130d2737 100644
--- 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))