The branch main has been updated by dougm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c48077d54da618bb1efb9213ab3759be6f59d4f1
commit c48077d54da618bb1efb9213ab3759be6f59d4f1
Author: Doug Moore <do...@freebsd.org>
AuthorDate: 2025-06-15 21:21:44 +0000
Commit: Doug Moore <do...@freebsd.org>
CommitDate: 2025-06-15 21:23:15 +0000
vm_map: drop vm_map_simplify_entry.9
A change in 2019 removed the function vm_map_simplify_entry(), but failed
to remove the manual page that documents it. As that was an internal
function not meant to be used outside the kernel, the manual page is
dropped, and a new manual page for the function that replaced it is
not added.
Reported by: pfg
Reviewed by: alc
Fixes: 83ea714f4fca ("vm_map_simplify_entry considers merging")
Differential Revision: https://reviews.freebsd.org/D50861
---
ObsoleteFiles.inc | 3 ++
share/man/man9/Makefile | 1 -
share/man/man9/vm_map.9 | 1 -
share/man/man9/vm_map_simplify_entry.9 | 59 ----------------------------------
4 files changed, 3 insertions(+), 61 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 8f5da0483a87..10ce9c7661de 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250615: don't install man page for absent function
+OLD_FILES+=usr/share/man/man9/vm_map_simplify_entry.9.gz
+
# 20250521: don't install zoneinfo version
OLD_FILES+=usr/share/zoneinfo/version
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index f7cd206126d6..badaee1479f7 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -393,7 +393,6 @@ MAN= accept_filter.9 \
vm_map_max.9 \
vm_map_protect.9 \
vm_map_remove.9 \
- vm_map_simplify_entry.9 \
vm_map_stack.9 \
vm_map_submap.9 \
vm_map_sync.9 \
diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9
index 9f41a24541b1..d08d54bd1004 100644
--- a/share/man/man9/vm_map.9
+++ b/share/man/man9/vm_map.9
@@ -323,7 +323,6 @@ is backed by a
.Xr vm_map_pmap 9 ,
.Xr vm_map_protect 9 ,
.Xr vm_map_remove 9 ,
-.Xr vm_map_simplify_entry 9 ,
.Xr vm_map_stack 9 ,
.Xr vm_map_submap 9 ,
.Xr vm_map_sync 9 ,
diff --git a/share/man/man9/vm_map_simplify_entry.9
b/share/man/man9/vm_map_simplify_entry.9
deleted file mode 100644
index 0e99596d067e..000000000000
--- a/share/man/man9/vm_map_simplify_entry.9
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"
-.\" Copyright (c) 2003 Bruce M Simpson <b...@spc.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd July 19, 2003
-.Dt VM_MAP_SIMPLIFY_ENTRY 9
-.Os
-.Sh NAME
-.Nm vm_map_simplify_entry
-.Nd simplify a
-.Vt vm_map_entry
-.Sh SYNOPSIS
-.In sys/param.h
-.In vm/vm.h
-.In vm/vm_map.h
-.Ft void
-.Fn vm_map_simplify_entry "vm_map_t map" "vm_map_entry_t entry"
-.Sh DESCRIPTION
-The
-.Fn vm_map_simplify_entry
-function simplifies the given
-.Fa entry
-by merging with either neighbour.
-The
-.Fa map
-must be locked upon entry.
-.Pp
-This function also has the ability to merge with both neighbours.
-.Pp
-This function guarantees that the passed entry remains valid, although
-possibly extended.
-.Sh SEE ALSO
-.Xr vm_map 9 ,
-.Xr vm_map_insert 9 ,
-.Xr vm_map_remove 9
-.Sh AUTHORS
-This manual page was written by
-.An Bruce M Simpson Aq Mt b...@spc.org .
