diff --git a/[refs] b/[refs]
index 9d1932810f99..c28c0afd8c19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37c2ac7872a9387542616f658d20ac25f5bdb32e
+refs/heads/master: 1ddd6db43a08cba56c7ee920800980862086f1c3
diff --git a/trunk/arch/alpha/include/asm/mman.h b/trunk/arch/alpha/include/asm/mman.h
index f7465418a8f3..72db984f8781 100644
--- a/trunk/arch/alpha/include/asm/mman.h
+++ b/trunk/arch/alpha/include/asm/mman.h
@@ -54,6 +54,7 @@
 #define MADV_UNMERGEABLE 13		/* KSM may not merge identical pages */
 
 #define MADV_HUGEPAGE	14		/* Worth backing with hugepages */
+#define MADV_NOHUGEPAGE	15		/* Not worth backing with hugepages */
 
 /* compatibility flags */
 #define MAP_FILE	0
diff --git a/trunk/arch/mips/include/asm/mman.h b/trunk/arch/mips/include/asm/mman.h
index 9d8184c527ff..785b4ea4ec3f 100644
--- a/trunk/arch/mips/include/asm/mman.h
+++ b/trunk/arch/mips/include/asm/mman.h
@@ -78,6 +78,7 @@
 #define MADV_HWPOISON    100		/* poison a page for testing */
 
 #define MADV_HUGEPAGE	14		/* Worth backing with hugepages */
+#define MADV_NOHUGEPAGE	15		/* Not worth backing with hugepages */
 
 /* compatibility flags */
 #define MAP_FILE	0
diff --git a/trunk/arch/parisc/include/asm/mman.h b/trunk/arch/parisc/include/asm/mman.h
index 533c5dc173c1..f5b7bf5fba68 100644
--- a/trunk/arch/parisc/include/asm/mman.h
+++ b/trunk/arch/parisc/include/asm/mman.h
@@ -60,6 +60,7 @@
 #define MADV_UNMERGEABLE 66		/* KSM may not merge identical pages */
 
 #define MADV_HUGEPAGE	67		/* Worth backing with hugepages */
+#define MADV_NOHUGEPAGE	68		/* Not worth backing with hugepages */
 
 /* compatibility flags */
 #define MAP_FILE	0
diff --git a/trunk/arch/xtensa/include/asm/mman.h b/trunk/arch/xtensa/include/asm/mman.h
index 41be9a1ee08f..30789010733d 100644
--- a/trunk/arch/xtensa/include/asm/mman.h
+++ b/trunk/arch/xtensa/include/asm/mman.h
@@ -84,6 +84,7 @@
 #define MADV_UNMERGEABLE 13		/* KSM may not merge identical pages */
 
 #define MADV_HUGEPAGE	14		/* Worth backing with hugepages */
+#define MADV_NOHUGEPAGE	15		/* Not worth backing with hugepages */
 
 /* compatibility flags */
 #define MAP_FILE	0
diff --git a/trunk/include/asm-generic/mman-common.h b/trunk/include/asm-generic/mman-common.h
index e91392fde4c6..787abbb6d867 100644
--- a/trunk/include/asm-generic/mman-common.h
+++ b/trunk/include/asm-generic/mman-common.h
@@ -46,6 +46,7 @@
 #define MADV_UNMERGEABLE 13		/* KSM may not merge identical pages */
 
 #define MADV_HUGEPAGE	14		/* Worth backing with hugepages */
+#define MADV_NOHUGEPAGE	15		/* Not worth backing with hugepages */
 
 /* compatibility flags */
 #define MAP_FILE	0