diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 10:53:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 10:53:22 -0400 |
commit | db16826367fefcb0ddb93d76b66adc52eb4e6339 (patch) | |
tree | 626224c1eb1eb79c522714591f208b4fdbdcd9d4 /mm/swapfile.c | |
parent | cd6045138ed1bb5d8773e940d51c34318eef3ef2 (diff) | |
parent | 465fdd97cbe16ef8727221857e96ef62dd352017 (diff) |
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
* 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (21 commits)
HWPOISON: Enable error_remove_page on btrfs
HWPOISON: Add simple debugfs interface to inject hwpoison on arbitary PFNs
HWPOISON: Add madvise() based injector for hardware poisoned pages v4
HWPOISON: Enable error_remove_page for NFS
HWPOISON: Enable .remove_error_page for migration aware file systems
HWPOISON: The high level memory error handler in the VM v7
HWPOISON: Add PR_MCE_KILL prctl to control early kill behaviour per process
HWPOISON: shmem: call set_page_dirty() with locked page
HWPOISON: Define a new error_remove_page address space op for async truncation
HWPOISON: Add invalidate_inode_page
HWPOISON: Refactor truncate to allow direct truncating of page v2
HWPOISON: check and isolate corrupted free pages v2
HWPOISON: Handle hardware poisoned pages in try_to_unmap
HWPOISON: Use bitmask/action code for try_to_unmap behaviour
HWPOISON: x86: Add VM_FAULT_HWPOISON handling to x86 page fault handler v2
HWPOISON: Add poison check to page fault handling
HWPOISON: Add basic support for poisoned pages in fault handler v3
HWPOISON: Add new SIGBUS error codes for hardware poison signals
HWPOISON: Add support for poison swap entries v2
HWPOISON: Export some rmap vma locking to outside world
...
Diffstat (limited to 'mm/swapfile.c')
-rw-r--r-- | mm/swapfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index f1bf19daadc6..4de7f02f820b 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
@@ -699,7 +699,7 @@ int free_swap_and_cache(swp_entry_t entry) | |||
699 | struct swap_info_struct *p; | 699 | struct swap_info_struct *p; |
700 | struct page *page = NULL; | 700 | struct page *page = NULL; |
701 | 701 | ||
702 | if (is_migration_entry(entry)) | 702 | if (non_swap_entry(entry)) |
703 | return 1; | 703 | return 1; |
704 | 704 | ||
705 | p = swap_info_get(entry); | 705 | p = swap_info_get(entry); |
@@ -2085,7 +2085,7 @@ static int __swap_duplicate(swp_entry_t entry, bool cache) | |||
2085 | int count; | 2085 | int count; |
2086 | bool has_cache; | 2086 | bool has_cache; |
2087 | 2087 | ||
2088 | if (is_migration_entry(entry)) | 2088 | if (non_swap_entry(entry)) |
2089 | return -EINVAL; | 2089 | return -EINVAL; |
2090 | 2090 | ||
2091 | type = swp_type(entry); | 2091 | type = swp_type(entry); |