diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/xtensa/include/asm/mman.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/xtensa/include/asm/mman.h')
| -rw-r--r-- | arch/xtensa/include/asm/mman.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/mman.h b/arch/xtensa/include/asm/mman.h index fca4db425f6e..30789010733d 100644 --- a/arch/xtensa/include/asm/mman.h +++ b/arch/xtensa/include/asm/mman.h | |||
| @@ -83,6 +83,9 @@ | |||
| 83 | #define MADV_MERGEABLE 12 /* KSM may merge identical pages */ | 83 | #define MADV_MERGEABLE 12 /* KSM may merge identical pages */ |
| 84 | #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ | 84 | #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ |
| 85 | 85 | ||
| 86 | #define MADV_HUGEPAGE 14 /* Worth backing with hugepages */ | ||
| 87 | #define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */ | ||
| 88 | |||
| 86 | /* compatibility flags */ | 89 | /* compatibility flags */ |
| 87 | #define MAP_FILE 0 | 90 | #define MAP_FILE 0 |
| 88 | 91 | ||