The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f6910b09a2302df9b3b1666deb89037c831a4e4c
commit f6910b09a2302df9b3b1666deb89037c831a4e4c Author: John Baldwin <[email protected]> AuthorDate: 2025-12-04 19:52:59 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2025-12-04 19:52:59 +0000 sys: Remove/update references to the swapper process in various comments Reviewed by: olce, markj Differential Revision: https://reviews.freebsd.org/D54051 --- sys/arm/arm/pmap-v6.c | 2 +- sys/i386/i386/pmap.c | 2 +- sys/sys/proc.h | 2 +- sys/sys/sleepqueue.h | 5 +---- sys/vm/vnode_pager.c | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 6a0ece1e4d98..d67267bba4e2 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -2158,7 +2158,7 @@ SYSCTL_PROC(_vm, OID_AUTO, kvm_free, ***********************************************/ /* - * Initialize the pmap for the swapper process. + * Initialize the pmap for proc0. */ void pmap_pinit0(pmap_t pmap) diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 1cf0867d57c3..2f9e6ccf43a8 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -2026,7 +2026,7 @@ pmap_abort_ptp(pmap_t pmap, vm_offset_t va, vm_page_t mpte) } /* - * Initialize the pmap for the swapper process. + * Initialize the pmap for proc0. */ static void __CONCAT(PMTYPE, pinit0)(pmap_t pmap) diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 8c0729d3ec66..23b052e21063 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1081,7 +1081,7 @@ extern int allproc_gen; extern struct sx proctree_lock; extern struct mtx ppeers_lock; extern struct mtx procid_lock; -extern struct proc proc0; /* Process slot for swapper. */ +extern struct proc proc0; /* Initial kernel process. */ extern struct thread0_storage thread0_st; /* Primary thread in proc0. */ #define thread0 (thread0_st.t0st_thread) extern struct vmspace vmspace0; /* VM space for proc0. */ diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h index f28a7f75a50c..25b345f46a81 100644 --- a/sys/sys/sleepqueue.h +++ b/sys/sys/sleepqueue.h @@ -54,10 +54,7 @@ * be removed from a specified sleep queue using the sleepq_remove() * function. Note that the sleep queue chain must first be locked via * sleepq_lock() before calling sleepq_abort(), sleepq_broadcast(), or - * sleepq_signal(). These routines each return a boolean that will be true - * if at least one swapped-out thread was resumed. In that case, the caller - * is responsible for waking up the swapper by calling kick_proc0() after - * releasing the sleep queue chain lock. + * sleepq_signal(). * * Each thread allocates a sleep queue at thread creation via sleepq_alloc() * and releases it at thread destruction via sleepq_free(). Note that diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 244aa31ea703..9693cb15f80d 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1264,7 +1264,7 @@ vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count, * Force synchronous operation if we are extremely low on memory * to prevent a low-memory deadlock. VOP operations often need to * allocate more memory to initiate the I/O ( i.e. do a BMAP - * operation ). The swapper handles the case by limiting the amount + * operation ). The swap pager handles the case by limiting the amount * of asynchronous I/O, but that sort of solution doesn't scale well * for the vnode pager without a lot of work. *
