aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mm.h
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2011-01-13 18:47:01 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 20:32:44 -0500
commitf2d6bfe9ff0acec30b713614260e78b03d20e909 (patch)
tree835dd9f4167513d94ae542cf92347ea98bff5ddc /include/linux/mm.h
parent5f24ce5fd34c3ca1b3d10d30da754732da64d5c0 (diff)
thp: add x86 32bit support
Add support for transparent hugepages to x86 32bit. Share the same VM_ bitflag for VM_MAPPED_COPY. mm/nommu.c will never support transparent hugepages. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Reviewed-by: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r--include/linux/mm.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7ab7d2b60041..9c2695beab86 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -102,7 +102,11 @@ extern unsigned int kobjsize(const void *objp);
102#define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */ 102#define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
103#define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ 103#define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
104#define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ 104#define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
105#ifndef CONFIG_TRANSPARENT_HUGEPAGE
105#define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */ 106#define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */
107#else
108#define VM_HUGEPAGE 0x01000000 /* MADV_HUGEPAGE marked this vma */
109#endif
106#define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */ 110#define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */
107#define VM_ALWAYSDUMP 0x04000000 /* Always include in core dumps */ 111#define VM_ALWAYSDUMP 0x04000000 /* Always include in core dumps */
108 112
@@ -111,9 +115,6 @@ extern unsigned int kobjsize(const void *objp);
111#define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */ 115#define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
112#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ 116#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
113#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ 117#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
114#if BITS_PER_LONG > 32
115#define VM_HUGEPAGE 0x100000000UL /* MADV_HUGEPAGE marked this vma */
116#endif
117 118
118/* Bits set in the VMA until the stack is in its final location */ 119/* Bits set in the VMA until the stack is in its final location */
119#define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ) 120#define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ)