From 99aff793d293ae3e8955012d5e755c7b69d4e2ee Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 21 May 2024 23:16:06 +0000
Subject: [PATCH] remove switch_exit() prototypes, replaced by sched_exit()

---
 sys/arch/alpha/alpha/vm_machdep.c | 4 ++--
 sys/arch/alpha/include/cpu.h      | 3 +--
 sys/arch/amd64/include/cpu.h      | 3 +--
 sys/arch/i386/include/cpu.h       | 3 +--
 sys/arch/m88k/m88k/vm_machdep.c   | 3 +--
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index b04a12651ea..78cd325037c 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.52 2023/10/24 13:20:09 claudio Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.53 2024/05/21 23:16:06 jsg Exp $ */
 /* $NetBSD: vm_machdep.c,v 1.55 2000/03/29 03:49:48 simonb Exp $ */
 
 /*
@@ -59,7 +59,7 @@ cpu_exit(p)
 	/*
 	 * Deactivate the exiting address space before the vmspace
 	 * is freed.  Note that we will continue to run on this
-	 * vmspace's context until the switch to idle in switch_exit().
+	 * vmspace's context until the switch to idle in sched_exit().
 	 */
 	pmap_deactivate(p);
 	sched_exit(p);
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index 62748d3346f..f91536fe066 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.73 2024/03/31 07:23:29 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.74 2024/05/21 23:16:06 jsg Exp $ */
 /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */
 
 /*-
@@ -145,7 +145,6 @@ void	proc_trampoline(void);					/* MAGIC */
 void	regdump(struct trapframe *);
 void	regtoframe(struct reg *, struct trapframe *);
 void	savectx(struct pcb *);
-void    switch_exit(struct proc *);				/* MAGIC */
 void	syscall(u_int64_t, struct trapframe *);
 void	trap(unsigned long, unsigned long, unsigned long, unsigned long,
 	    struct trapframe *);
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 758950f4e41..57e3c62210c 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.169 2024/05/12 16:49:38 guenther Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.170 2024/05/21 23:16:06 jsg Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -428,7 +428,6 @@ void	lgdt(struct region_descriptor *);
 
 struct pcb;
 void	savectx(struct pcb *);
-void	switch_exit(struct proc *, void (*)(struct proc *));
 void	proc_trampoline(void);
 
 /* clock.c */
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 60f0d044a4d..1c2d693846c 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.188 2024/05/01 12:54:27 mpi Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.189 2024/05/21 23:16:06 jsg Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -418,7 +418,6 @@ void	lgdt(struct region_descriptor *);
 
 struct pcb;
 void	savectx(struct pcb *);
-void	switch_exit(struct proc *);
 void	proc_trampoline(void);
 
 /* clock.c */
diff --git a/sys/arch/m88k/m88k/vm_machdep.c b/sys/arch/m88k/m88k/vm_machdep.c
index f3e184d8362..edb3c2e95c4 100644
--- a/sys/arch/m88k/m88k/vm_machdep.c
+++ b/sys/arch/m88k/m88k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.28 2023/04/11 00:45:07 jsg Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.29 2024/05/21 23:16:06 jsg Exp $	*/
 
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -60,7 +60,6 @@
 #include <machine/trap.h>
 
 extern void savectx(struct pcb *);
-extern void switch_exit(struct proc *);
 
 /*
  * Finish a fork operation, with process p2 nearly set up.
-- 
2.20.1