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

[safe/jmp/linux-2.6] / include / asm-generic / mman-common.h

diff --git a/include/asm-generic/mman-common.h b/include/asm-generic/mman-common.h
index c325d1e..5ee13b2 100644 (file)
--- a/include/asm-generic/mman-common.h
+++ b/include/asm-generic/mman-common.h
@@ -36,6 +36,9 @@
 #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