From 05a28cf7ef7ef90c0c323928bbacac886dadd543 Mon Sep 17 00:00:00 2001 From: Andrea Arcangeli Date: Thu, 13 Jan 2011 15:46:31 -0800 Subject: [PATCH] --- yaml --- r: 230745 b: refs/heads/master c: a826e422420b461a6247137c292ff83c4800354a h: refs/heads/master i: 230743: 660336704b5d283afbf6602da15d4be79fe6a434 v: v3 --- [refs] | 2 +- trunk/arch/alpha/include/asm/mman.h | 2 ++ trunk/arch/mips/include/asm/mman.h | 2 ++ trunk/arch/parisc/include/asm/mman.h | 2 ++ trunk/arch/xtensa/include/asm/mman.h | 2 ++ trunk/include/asm-generic/mman-common.h | 2 ++ 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 095bc046c831..878b4b7d20a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c9bf22c09ae14d65225d9b9619b2eb357350cd7 +refs/heads/master: a826e422420b461a6247137c292ff83c4800354a diff --git a/trunk/arch/alpha/include/asm/mman.h b/trunk/arch/alpha/include/asm/mman.h index 99c56d47879d..f7465418a8f3 100644 --- a/trunk/arch/alpha/include/asm/mman.h +++ b/trunk/arch/alpha/include/asm/mman.h @@ -53,6 +53,8 @@ #define MADV_MERGEABLE 12 /* KSM may merge identical pages */ #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ +#define MADV_HUGEPAGE 14 /* 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 c892bfb3e2c1..9d8184c527ff 100644 --- a/trunk/arch/mips/include/asm/mman.h +++ b/trunk/arch/mips/include/asm/mman.h @@ -77,6 +77,8 @@ #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ #define MADV_HWPOISON 100 /* poison a page for testing */ +#define MADV_HUGEPAGE 14 /* 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 9749c8afe83a..533c5dc173c1 100644 --- a/trunk/arch/parisc/include/asm/mman.h +++ b/trunk/arch/parisc/include/asm/mman.h @@ -59,6 +59,8 @@ #define MADV_MERGEABLE 65 /* KSM may merge identical pages */ #define MADV_UNMERGEABLE 66 /* KSM may not merge identical pages */ +#define MADV_HUGEPAGE 67 /* Worth backing with hugepages */ + /* compatibility flags */ #define MAP_FILE 0 #define MAP_VARIABLE 0 diff --git a/trunk/arch/xtensa/include/asm/mman.h b/trunk/arch/xtensa/include/asm/mman.h index fca4db425f6e..41be9a1ee08f 100644 --- a/trunk/arch/xtensa/include/asm/mman.h +++ b/trunk/arch/xtensa/include/asm/mman.h @@ -83,6 +83,8 @@ #define MADV_MERGEABLE 12 /* KSM may merge identical pages */ #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ +#define MADV_HUGEPAGE 14 /* 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 3da9e2742fa0..e91392fde4c6 100644 --- a/trunk/include/asm-generic/mman-common.h +++ b/trunk/include/asm-generic/mman-common.h @@ -45,6 +45,8 @@ #define MADV_MERGEABLE 12 /* KSM may merge identical pages */ #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ +#define MADV_HUGEPAGE 14 /* Worth backing with hugepages */ + /* compatibility flags */ #define MAP_FILE 0