Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux...

* '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
  ...

diff --cc Documentation/sysctl/vm.txt
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc fs/btrfs/inode.c
index 9096fd0ca3ca447a7195f489f03d862340173494,dd86050190fcb28e08d59ffa2b812db14c5764be..d154a3f365d53bf159f6e22aaa1714bccb4e7c56
--- 1/fs/btrfs/inode.c
--- 2/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -5269,9 -5269,10 +5269,10 @@@ static const struct address_space_opera
        .invalidatepage = btrfs_invalidatepage,
        .releasepage    = btrfs_releasepage,
        .set_page_dirty = btrfs_set_page_dirty,
+       .error_remove_page = generic_error_remove_page,
  };
  
 -static struct address_space_operations btrfs_symlink_aops = {
 +static const struct address_space_operations btrfs_symlink_aops = {
        .readpage       = btrfs_readpage,
        .writepage      = btrfs_writepage,
        .invalidatepage = btrfs_invalidatepage,

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ocfs2/aops.c
Simple merge

diff --cc fs/proc/meminfo.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_aops.c
Simple merge

diff --cc include/asm-generic/mman-common.h
index dd63bd38864b23627f36e57b53c8413af63cd238,c325d1ef42ab746bc9086e3c8347802a8a9c561a..5ee13b2fd223599422446b509227eadb24b7f7e8
--- 1/include/asm-generic/mman-common.h
--- 2/include/asm-generic/mman-common.h
+++ b/include/asm-generic/mman-common.h
@@@ -34,10 -34,8 +34,11 @@@
  #define MADV_REMOVE   9               /* remove these pages & resources */
  #define MADV_DONTFORK 10              /* don't inherit across fork */
  #define MADV_DOFORK   11              /* do inherit across fork */
+ #define MADV_HWPOISON 100             /* poison a page for testing */
  
 +#define MADV_MERGEABLE   12           /* KSM may merge identical pages */
 +#define MADV_UNMERGEABLE 13           /* KSM may not merge identical pages */
 +
  /* compatibility flags */
  #define MAP_FILE      0
  

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/page-flags.h
Simple merge

diff --cc include/linux/prctl.h
index 07bff666e65b695d1062638f8d20f9770d610161,3dc303197e674ec1afce3394ca7d0d6a74b768cf..931150566ade8d720f156665b2a5400bbc499f0d
--- 1/include/linux/prctl.h
--- 2/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@@ -85,7 -85,9 +85,9 @@@
  #define PR_SET_TIMERSLACK 29
  #define PR_GET_TIMERSLACK 30
  
 -#define PR_TASK_PERF_COUNTERS_DISABLE         31
 -#define PR_TASK_PERF_COUNTERS_ENABLE          32
 +#define PR_TASK_PERF_EVENTS_DISABLE           31
 +#define PR_TASK_PERF_EVENTS_ENABLE            32
  
+ #define PR_MCE_KILL   33
+ 
  #endif /* _LINUX_PRCTL_H */

diff --cc include/linux/rmap.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/swap.h
Simple merge

diff --cc kernel/sys.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/Makefile
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/madvise.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/migrate.c
index 16052e80aaacbc182c9ea421bb7f84b02fc3a5b4,e3a0cd3859a9a71b682178c08ec346e6f22aec73..1a4bf4813780eb700ee026030bca18fedc2fbae6
--- 1/mm/migrate.c
--- 2/mm/migrate.c
+++ b/mm/migrate.c
@@@ -675,9 -669,8 +675,9 @@@ static int unmap_and_move(new_page_t ge
        }
  
        /* Establish migration ptes or remove ptes */
-       try_to_unmap(page, 1);
+       try_to_unmap(page, TTU_MIGRATION|TTU_IGNORE_MLOCK|TTU_IGNORE_ACCESS);
  
 +skip_unmap:
        if (!page_mapped(page))
                rc = move_to_new_page(newpage, page);
  

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/rmap.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc mm/vmscan.c
Simple merge