diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory-failure.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index e17ec3f1c637..e354b9f2f389 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
36 | #include <linux/page-flags.h> | 36 | #include <linux/page-flags.h> |
37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
38 | #include <linux/ksm.h> | ||
38 | #include <linux/rmap.h> | 39 | #include <linux/rmap.h> |
39 | #include <linux/pagemap.h> | 40 | #include <linux/pagemap.h> |
40 | #include <linux/swap.h> | 41 | #include <linux/swap.h> |
@@ -644,7 +645,7 @@ static void hwpoison_user_mappings(struct page *p, unsigned long pfn, | |||
644 | int i; | 645 | int i; |
645 | int kill = 1; | 646 | int kill = 1; |
646 | 647 | ||
647 | if (PageReserved(p) || PageCompound(p) || PageSlab(p)) | 648 | if (PageReserved(p) || PageCompound(p) || PageSlab(p) || PageKsm(p)) |
648 | return; | 649 | return; |
649 | 650 | ||
650 | /* | 651 | /* |