summaryrefslogtreecommitdiff
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2009-09-16 11:50:05 +0200
committerAndi Kleen <ak@linux.intel.com>2009-09-16 11:50:05 +0200
commita7420aa54dbf699a5a05feba3c859b6baaa3938c (patch)
tree97119d311149c902b3bd3a6157e70fb79c876462 /mm/swapfile.c
parent10be22dfe1e6ad978269dc275147e0ed049187bb (diff)
downloadlinux-3.10-a7420aa54dbf699a5a05feba3c859b6baaa3938c.tar.gz
linux-3.10-a7420aa54dbf699a5a05feba3c859b6baaa3938c.tar.bz2
linux-3.10-a7420aa54dbf699a5a05feba3c859b6baaa3938c.zip
HWPOISON: Add support for poison swap entries v2
Memory migration uses special swap entry types to trigger special actions on page faults. Extend this mechanism to also support poisoned swap entries, to trigger poison handling on page faults. This allows follow-on patches to prevent processes from faulting in poisoned pages again. v2: Fix overflow in MAX_SWAPFILES (Fengguang Wu) v3: Better overflow fix (Hidehiro Kawai) Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'mm/swapfile.c')
-rw-r--r--mm/swapfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 74f1102e874..ce5dda6d604 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -699,7 +699,7 @@ int free_swap_and_cache(swp_entry_t entry)
struct swap_info_struct *p;
struct page *page = NULL;
- if (is_migration_entry(entry))
+ if (non_swap_entry(entry))
return 1;
p = swap_info_get(entry);
@@ -2085,7 +2085,7 @@ static int __swap_duplicate(swp_entry_t entry, bool cache)
int count;
bool has_cache;
- if (is_migration_entry(entry))
+ if (non_swap_entry(entry))
return -EINVAL;
type = swp_type(entry);