- Make npx_intr INTR_MPSAFE and move acquiring Giant into the

  function itself.
- Remove a hack to allow acquiring Giant from the npx asm trap
  vector.

1 files changed, 0 insertions, 20 deletions

diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index da8f197..0d42519 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -100,8 +100,6 @@ static struct mtx all_mtx = { MTX_UNOWNED, 0, 0, "All mutexes queue head",
 static int	mtx_cur_cnt;
 static int	mtx_max_cnt;
 
-void	_mtx_enter_giant_def(void);
-void	_mtx_exit_giant_def(void);
 static void propagate_priority(struct proc *);
 
 #define	mtx_unowned(m)	((m)->mtx_lock == MTX_UNOWNED)
@@ -111,24 +109,6 @@ static void propagate_priority(struct proc *);
 #define RETIP(x)		*(((uintptr_t *)(&x)) - 1)
 #define	SET_PRIO(p, pri)	(p)->p_priority = (pri)
 
-/*
- * XXX Temporary, for use from assembly language
- */
-
-void
-_mtx_enter_giant_def(void)
-{
-
-	mtx_enter(&Giant, MTX_DEF);
-}
-
-void
-_mtx_exit_giant_def(void)
-{
-
-	mtx_exit(&Giant, MTX_DEF);
-}
-
 static void
 propagate_priority(struct proc *p)
 {