Do not splhigh() before invoking sched_exit(), sched_exit() will do it better.

6 files changed, 7 insertions, 30 deletions

diff --git a/sys/arch/hp300/hp300/vm_machdep.c b/sys/arch/hp300/hp300/vm_machdep.c
index abc6af74605..eba6f968d8e 100644
--- a/sys/arch/hp300/hp300/vm_machdep.c
+++ b/sys/arch/hp300/hp300/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.44 2007/10/10 15:53:51 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.45 2007/10/13 07:17:59 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.60 2001/07/06 05:53:35 chs Exp $	*/
 
 /*
@@ -126,15 +126,12 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 /*
  * cpu_exit is called as the last action during exit.
  *
- * Block context switches and then call switch_exit() which will
- * switch to another process thus we never return.
+ * Call switch_exit() which will switch to another process thus we never return.
  */
 void
 cpu_exit(p)
 	struct proc *p;
 {
-	(void)splhigh();
-
 	pmap_deactivate(p);
 	sched_exit(p);
 }
diff --git a/sys/arch/m88k/m88k/vm_machdep.c b/sys/arch/m88k/m88k/vm_machdep.c
index e967b892cf8..4ca1ece2c3a 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.16 2007/10/10 15:53:52 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.17 2007/10/13 07:18:01 miod Exp $	*/
 
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -136,15 +136,10 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 
 /*
  * cpu_exit is called as the last action during exit.
- *
- * Block context switches and then call switch_exit() which will
- * switch to another process thus we never return.
  */
 void
 cpu_exit(struct proc *p)
 {
-	(void)splhigh();
-
 	pmap_deactivate(p);
 	sched_exit(p);
 }
diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c
index 6ff6156056b..ee41e438c57 100644
--- a/sys/arch/mac68k/mac68k/vm_machdep.c
+++ b/sys/arch/mac68k/mac68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.40 2007/10/10 15:53:52 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.41 2007/10/13 07:18:01 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.29 1998/07/28 18:34:55 thorpej Exp $	*/
 
 /*
@@ -119,16 +119,11 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 
 /*
  * cpu_exit is called as the last action during exit.
- *
- * Block context switches and then call switch_exit() which will
- * switch to another process thus we never return.
  */
 void
 cpu_exit(p)
 	struct proc *p;
 {
-	(void)splhigh();
-
 	pmap_deactivate(p);
 	sched_exit(p);
 }
diff --git a/sys/arch/mips64/mips64/vm_machdep.c b/sys/arch/mips64/mips64/vm_machdep.c
index d6517d55ffd..ce4de4e5bf9 100644
--- a/sys/arch/mips64/mips64/vm_machdep.c
+++ b/sys/arch/mips64/mips64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.16 2007/10/10 15:53:52 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.17 2007/10/13 07:18:01 miod Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -123,7 +123,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 
 /*
  * cpu_exit is called as the last action during exit.
- * release adress space and machine dependent resources.
  */
 void
 cpu_exit(p)
@@ -134,7 +133,6 @@ cpu_exit(p)
 	if (machFPCurProcPtr == p)
 		machFPCurProcPtr = (struct proc *)0;
 
-	(void)splhigh();
 	pmap_deactivate(p);
 	sched_exit(p);
 }
diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c
index df44535cfda..f738389d254 100644
--- a/sys/arch/mvme68k/mvme68k/vm_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.46 2007/10/10 15:53:52 art Exp $ */
+/*	$OpenBSD: vm_machdep.c,v 1.47 2007/10/13 07:18:01 miod Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -117,16 +117,11 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 
 /*
  * cpu_exit is called as the last action during exit.
- *
- * Block context switches and then call switch_exit() which will
- * switch to another process thus we never return.
  */
 void
 cpu_exit(p)
 	struct proc *p;
 {
-	(void)splhigh();
-
 	pmap_deactivate(p);
 	sched_exit(p);
 }
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index 603bb17e3d3..c913238c64d 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.35 2007/10/10 15:53:53 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.36 2007/10/13 07:18:02 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.67 2000/06/29 07:14:34 mrg Exp $	     */
 
 /*
@@ -61,9 +61,6 @@
 void
 cpu_exit(struct proc *p)
 {
-	int s;
-	s = splhigh();	/* splclock(); */
-
 	pmap_deactivate(p);
 	sched_exit(p);
 }