summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2013-06-15 09:39:21 +0200
committerRichard Braun <rbraun@sceen.net>2013-06-15 09:41:26 +0200
commitcb92d9b44686dae10f94a410c5cab93ff29f7208 (patch)
tree1aef1efc4aa24bc5f238bedde9e7516feaf4fa4a
parent05cd3a850557d27648ba9c7cfc5267d66c20f5ee (diff)
vm/vm_map: advice macros update
Use slightly shorter names, add WILLNEED and DONTNEED, and update users.
-rw-r--r--vm/vm_kmem.c2
-rw-r--r--vm/vm_map.c6
-rw-r--r--vm/vm_map.h24
3 files changed, 18 insertions, 14 deletions
diff --git a/vm/vm_kmem.c b/vm/vm_kmem.c
index bb95f4af..9f6088de 100644
--- a/vm/vm_kmem.c
+++ b/vm/vm_kmem.c
@@ -124,7 +124,7 @@ vm_kmem_alloc_va(size_t size)
va = 0;
flags = VM_MAP_PROT_ALL | VM_MAP_MAX_PROT_ALL | VM_MAP_INHERIT_NONE
- | VM_MAP_ADVISE_NORMAL;
+ | VM_MAP_ADV_NORMAL;
error = vm_map_enter(kernel_map, NULL, 0, &va, size, 0, flags);
if (error)
diff --git a/vm/vm_map.c b/vm/vm_map.c
index d8d9930f..83091c0e 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -263,7 +263,7 @@ vm_map_kentry_setup(void)
assert(vm_page_aligned(VM_MAP_KENTRY_SIZE));
flags = VM_MAP_PROT_ALL | VM_MAP_MAX_PROT_ALL | VM_MAP_INHERIT_NONE
- | VM_MAP_ADVISE_NORMAL | VM_MAP_NOMERGE;
+ | VM_MAP_ADV_NORMAL | VM_MAP_NOMERGE;
error = vm_map_prepare(kernel_map, NULL, 0, 0, VM_MAP_KENTRY_SIZE + size,
0, flags, &request);
@@ -379,7 +379,7 @@ vm_map_request_assert_valid(const struct vm_map_request *request)
max_prot = vm_map_get_max_protection(request->flags);
assert((prot & max_prot) == prot);
assert(__builtin_popcount(request->flags & VM_MAP_INHERIT_MASK) == 1);
- assert(__builtin_popcount(request->flags & VM_MAP_ADVISE_MASK) == 1);
+ assert(__builtin_popcount(request->flags & VM_MAP_ADV_MASK) == 1);
assert(!(request->flags & VM_MAP_FIXED)
|| (request->align == 0)
|| P2ALIGNED(request->start, request->align));
@@ -947,7 +947,7 @@ vm_map_setup(void)
*/
vm_kmem_boot_space(&start, &end);
flags = VM_MAP_PROT_ALL | VM_MAP_MAX_PROT_ALL | VM_MAP_INHERIT_NONE
- | VM_MAP_ADVISE_NORMAL | VM_MAP_NOMERGE | VM_MAP_FIXED;
+ | VM_MAP_ADV_NORMAL | VM_MAP_NOMERGE | VM_MAP_FIXED;
error = vm_map_prepare(kernel_map, NULL, 0, start, end - start, 0, flags,
&request);
diff --git a/vm/vm_map.h b/vm/vm_map.h
index d4a8eb02..3847001c 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -56,15 +56,19 @@
| VM_MAP_INHERIT_COPY \
| VM_MAP_INHERIT_NONE)
-#define VM_MAP_ADVISE_NORMAL 0x01000
-#define VM_MAP_ADVISE_RAND 0x02000
-#define VM_MAP_ADVISE_SEQ 0x04000
-#define VM_MAP_ADVISE_MASK (VM_MAP_ADVISE_NORMAL \
- | VM_MAP_ADVISE_RAND \
- | VM_MAP_ADVISE_SEQ)
-
-#define VM_MAP_NOMERGE 0x10000
-#define VM_MAP_FIXED 0x20000 /* Not an entry flag */
+#define VM_MAP_ADV_NORMAL 0x01000
+#define VM_MAP_ADV_RAND 0x02000
+#define VM_MAP_ADV_SEQUENTIAL 0x04000
+#define VM_MAP_ADV_WILLNEED 0x08000
+#define VM_MAP_ADV_DONTNEED 0x10000
+#define VM_MAP_ADV_MASK (VM_MAP_ADV_NORMAL \
+ | VM_MAP_ADV_RAND \
+ | VM_MAP_ADV_SEQUENTIAL \
+ | VM_MAP_ADV_WILLNEED \
+ | VM_MAP_ADV_DONTNEED)
+
+#define VM_MAP_NOMERGE 0x20000
+#define VM_MAP_FIXED 0x40000 /* Not an entry flag */
/*
* Flags that can be used as map entry flags.
@@ -72,7 +76,7 @@
#define VM_MAP_ENTRY_MASK (VM_MAP_PROT_MASK \
| VM_MAP_MAX_PROT_MASK \
| VM_MAP_INHERIT_MASK \
- | VM_MAP_ADVISE_MASK \
+ | VM_MAP_ADV_MASK \
| VM_MAP_NOMERGE)
/*