Make userret() MI. On architectures which jammed stuff into it in the

past, pull that code out seperately.
ok guenther miod

1 files changed, 1 insertions, 21 deletions

diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c
index e6e599a1000..b25427c945c 100644
--- a/sys/arch/vax/vax/trap.c
+++ b/sys/arch/vax/vax/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.41 2011/04/03 14:56:28 guenther Exp $     */
+/*	$OpenBSD: trap.c,v 1.42 2011/11/16 20:50:19 deraadt Exp $     */
 /*	$NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $     */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -64,8 +64,6 @@
 volatile int startsysc = 0, faultdebug = 0;
 #endif
 
-static __inline void userret(struct proc *);
-
 void	arithflt(struct trapframe *);
 void	syscall(struct trapframe *);
 
@@ -100,24 +98,6 @@ int no_traps = 18;
 		return;						\
 	} while (0)
 
-/*
- * userret:
- *
- *	Common code used by various exception handlers to
- *	return to usermode.
- */
-static __inline void
-userret(struct proc *p)
-{
-	int sig;
-
-	/* Take pending signals. */
-	while ((sig = CURSIG(p)) !=0)
-		postsig(sig);
-
-	p->p_cpu->ci_schedstate.spc_curpriority = p->p_priority = p->p_usrpri;
-}
-
 void
 arithflt(frame)
 	struct trapframe *frame;