svn commit: r271244 - head/sys/vm

[Alan Cox]

Author: alc
Date: Mon Sep  8 02:25:01 2014
New Revision: 271244
URL: http://svnweb.freebsd.org/changeset/base/271244

Log:
  Oops.  vm_map_simplify_entry() is used by mac_proc_vm_revoke_recurse(), so
  it can't be static.

Modified:
  head/sys/vm/vm_map.c
  head/sys/vm/vm_map.h

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Mon Sep  8 00:19:03 2014	(r271243)
+++ head/sys/vm/vm_map.c	Mon Sep  8 02:25:01 2014	(r271244)
@@ -135,7 +135,6 @@ static void vm_map_entry_dispose(vm_map_
 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;

Modified: head/sys/vm/vm_map.h
==============================================================================
--- head/sys/vm/vm_map.h	Mon Sep  8 00:19:03 2014	(r271243)
+++ head/sys/vm/vm_map.h	Mon Sep  8 02:25:01 2014	(r271244)
@@ -381,6 +381,7 @@ void vm_map_lookup_done (vm_map_t, vm_ma
 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);