diff options
author | alc <alc@FreeBSD.org> | 2014-09-08 02:25:01 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2014-09-08 02:25:01 +0000 |
commit | 1771ced43b898ca568c0c1a142477ad0822f69ad (patch) | |
tree | 03e06ccf512a4fc4147d4dec08a3561970b14532 | |
parent | 6a1691365d1f8affbeec4982dc732da7f34c35fb (diff) | |
download | FreeBSD-src-1771ced43b898ca568c0c1a142477ad0822f69ad.zip FreeBSD-src-1771ced43b898ca568c0c1a142477ad0822f69ad.tar.gz |
Oops. vm_map_simplify_entry() is used by mac_proc_vm_revoke_recurse(), so
it can't be static.
-rw-r--r-- | sys/vm/vm_map.c | 3 | ||||
-rw-r--r-- | sys/vm/vm_map.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 4515b38..50929f6 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -135,7 +135,6 @@ 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); @@ -1507,7 +1506,7 @@ again: * possibly extended). When merging, this routine may delete one or * both neighbors. */ -static void +void vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry) { vm_map_entry_t next, prev; diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index c54cfee..3bf7a67 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -381,6 +381,7 @@ 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 *); 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_simplify_entry(vm_map_t map, vm_map_entry_t entry); 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); |