From 077ec27cd6b3c50dc5a197eb3a71fa9f27526a1a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 8 Sep 2014 00:19:03 +0000 Subject: [PATCH] Make two functions static and eliminate an unused #define. --- sys/vm/vm_map.c | 7 +++++-- sys/vm/vm_map.h | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 68ae0d2f482..4515b38e9e6 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -133,6 +133,9 @@ static void _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t system_map); static void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry); static void vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry); +static void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, + vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags); +static void vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry); #ifdef INVARIANTS static void vm_map_zdtor(void *mem, int size, void *arg); static void vmspace_zdtor(void *mem, int size, void *arg); @@ -1504,7 +1507,7 @@ again: * possibly extended). When merging, this routine may delete one or * both neighbors. */ -void +static void vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry) { vm_map_entry_t next, prev; @@ -1809,7 +1812,7 @@ vm_map_submap( * being created speculatively, cached pages are not reactivated and * mapped. */ -void +static void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags) { diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 8cced057ea1..c54cfee231a 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -302,9 +302,8 @@ long vmspace_resident_count(struct vmspace *vmspace); #endif /* _KERNEL */ -/* XXX: number of kernel maps and entries to statically allocate */ +/* XXX: number of kernel maps to statically allocate */ #define MAX_KMAP 10 -#define MAX_KMAPENT 128 /* * Copy-on-write flags for vm_map operations @@ -380,15 +379,12 @@ int vm_map_lookup_locked(vm_map_t *, vm_offset_t, vm_prot_t, vm_map_entry_t *, v vm_pindex_t *, vm_prot_t *, boolean_t *); void vm_map_lookup_done (vm_map_t, vm_map_entry_t); boolean_t vm_map_lookup_entry (vm_map_t, vm_offset_t, vm_map_entry_t *); -void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, - vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags); int vm_map_protect (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t); int vm_map_remove (vm_map_t, vm_offset_t, vm_offset_t); void vm_map_startup (void); int vm_map_submap (vm_map_t, vm_offset_t, vm_offset_t, vm_map_t); int vm_map_sync(vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t); int vm_map_madvise (vm_map_t, vm_offset_t, vm_offset_t, int); -void vm_map_simplify_entry (vm_map_t, vm_map_entry_t); int vm_map_stack (vm_map_t, vm_offset_t, vm_size_t, vm_prot_t, vm_prot_t, int); int vm_map_growstack (struct proc *p, vm_offset_t addr); int vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,