diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-01-11 19:34:53 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-01-11 19:34:53 +0000 |
| commit | d37df5ec70f196bf3422c89074f8fa3de1707489 (patch) | |
| tree | cadd29d58bed8aa4fa1e754383471a7c8dca328b /sys | |
| parent | e459dfb547122bbe4cfae3d5220990a319a2f5b9 (diff) | |
LOCKDEBUG is dead; perform the funeral rites
pointed out by Helg (xx404 (at) msn.com)
ok deraadt@ miod@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/trap.c | 7 | ||||
| -rw-r--r-- | sys/sys/sched.h | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c index d39c2061198..5119002090d 100644 --- a/sys/arch/i386/i386/trap.c +++ b/sys/arch/i386/i386/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.119 2014/12/02 18:13:10 tedu Exp $ */ +/* $OpenBSD: trap.c,v 1.120 2015/01/11 19:34:52 guenther Exp $ */ /* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */ /*- @@ -381,11 +381,6 @@ trap(struct trapframe *frame) case T_PAGEFLT: /* allow page faults in kernel mode */ if (p == 0 || p->p_addr == 0) goto we_re_toast; -#ifdef LOCKDEBUG - /* If we page-fault while in scheduler, we're doomed. */ - if (__mp_lock_held(&sched_lock)) - goto we_re_toast; -#endif pcb = &p->p_addr->u_pcb; #if 0 diff --git a/sys/sys/sched.h b/sys/sys/sched.h index 032580f5fe1..695780ae70a 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sched.h,v 1.37 2014/10/17 01:51:39 tedu Exp $ */ +/* $OpenBSD: sched.h,v 1.38 2015/01/11 19:34:52 guenther Exp $ */ /* $NetBSD: sched.h,v 1.2 1999/02/28 18:14:58 ross Exp $ */ /*- @@ -183,7 +183,7 @@ void remrunqueue(struct proc *); yield(); \ } while (0) -#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG) +#if defined(MULTIPROCESSOR) #include <sys/lock.h> /* @@ -215,7 +215,7 @@ do { \ splx(s); \ } while (/* CONSTCOND */ 0) -#else /* ! MULTIPROCESSOR || LOCKDEBUG */ +#else /* ! MULTIPROCESSOR */ #define SCHED_ASSERT_LOCKED() splassert(IPL_SCHED); #define SCHED_ASSERT_UNLOCKED() /* nothing */ @@ -225,7 +225,7 @@ do { \ #define SCHED_LOCK(s) s = splsched() #define SCHED_UNLOCK(s) splx(s) -#endif /* MULTIPROCESSOR || LOCKDEBUG */ +#endif /* MULTIPROCESSOR */ #endif /* _KERNEL */ #endif /* _SYS_SCHED_H_ */ |