From 3c5e8da74bf1dfe5aab02594119375d62edd84a4 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 21 Sep 2009 17:01:53 -0700 Subject: [PATCH] --- yaml --- r: 164401 b: refs/heads/master c: d19f352484467a5e518639ddff0554669c10ffab h: refs/heads/master i: 164399: 0a32c19775daea6c10f4c975b4ee8bd3ae78a5b8 v: v3 --- [refs] | 2 +- trunk/arch/alpha/include/asm/mman.h | 3 +++ trunk/arch/mips/include/asm/mman.h | 3 +++ trunk/arch/parisc/include/asm/mman.h | 3 +++ trunk/arch/xtensa/include/asm/mman.h | 3 +++ trunk/include/asm-generic/mman-common.h | 3 +++ 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 86934198a224..3a1244318229 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3866ea90d3635ddddcd77ce51087222ac7de85f2 +refs/heads/master: d19f352484467a5e518639ddff0554669c10ffab diff --git a/trunk/arch/alpha/include/asm/mman.h b/trunk/arch/alpha/include/asm/mman.h index 90d7c35d2867..c77c55756a7c 100644 --- a/trunk/arch/alpha/include/asm/mman.h +++ b/trunk/arch/alpha/include/asm/mman.h @@ -48,6 +48,9 @@ #define MADV_DONTFORK 10 /* don't inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */ +#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 --git a/trunk/arch/mips/include/asm/mman.h b/trunk/arch/mips/include/asm/mman.h index e4d6f1fb1cf7..f15554d1518a 100644 --- a/trunk/arch/mips/include/asm/mman.h +++ b/trunk/arch/mips/include/asm/mman.h @@ -71,6 +71,9 @@ #define MADV_DONTFORK 10 /* don't inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */ +#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 --git a/trunk/arch/parisc/include/asm/mman.h b/trunk/arch/parisc/include/asm/mman.h index defe752cc996..a12d9d43f507 100644 --- a/trunk/arch/parisc/include/asm/mman.h +++ b/trunk/arch/parisc/include/asm/mman.h @@ -54,6 +54,9 @@ #define MADV_16M_PAGES 24 /* Use 16 Megabyte pages */ #define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */ +#define MADV_MERGEABLE 65 /* KSM may merge identical pages */ +#define MADV_UNMERGEABLE 66 /* KSM may not merge identical pages */ + /* 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 9b92620c8a1e..6e55b4d1f9c5 100644 --- a/trunk/arch/xtensa/include/asm/mman.h +++ b/trunk/arch/xtensa/include/asm/mman.h @@ -78,6 +78,9 @@ #define MADV_DONTFORK 10 /* don't inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */ +#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 --git a/trunk/include/asm-generic/mman-common.h b/trunk/include/asm-generic/mman-common.h index 3b69ad34189a..dd63bd38864b 100644 --- a/trunk/include/asm-generic/mman-common.h +++ b/trunk/include/asm-generic/mman-common.h @@ -35,6 +35,9 @@ #define MADV_DONTFORK 10 /* don't inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */ +#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