diff options
| author | Hugh Dickins <hugh.dickins@tiscali.co.uk> | 2009-10-13 15:02:11 +0100 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2009-10-19 07:29:20 +0200 |
| commit | 01e00f880ca700376e1845cf7a2524ebe68e47d6 (patch) | |
| tree | 6e15c363298dd01dd44d5c96afd9ef36078a1247 /mm | |
| parent | 4779cb31c0ee3b355116745edca3f3e5fe865553 (diff) | |
| download | linux-3.10-01e00f880ca700376e1845cf7a2524ebe68e47d6.tar.gz linux-3.10-01e00f880ca700376e1845cf7a2524ebe68e47d6.tar.bz2 linux-3.10-01e00f880ca700376e1845cf7a2524ebe68e47d6.zip | |
HWPOISON: fix oops on ksm pages
Memory failure on a KSM page currently oopses on its NULL anon_vma in
page_lock_anon_vma(): that may not be much worse than the consequence
of ignoring it, but it is better to be consistent with how ZERO_PAGE
and hugetlb pages and other awkward cases are treated. Just skip it.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
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 e17ec3f1c63..e354b9f2f38 100644 --- a/mm/memory-failure.c +++ b/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; /* |