diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-07-06 21:54:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-07-06 21:54:00 +0000 |
| commit | 7e863cd08d776f4fb7c0d1a5b775ddfc21a148cb (patch) | |
| tree | 56a66b648f494e3115dc27b8f20489bfb3a62abf | |
| parent | 66d4799ae979bc229147399ef96ea5df2ce60a09 (diff) | |
assert is dumb dumb dumb; no objection from miod
| -rw-r--r-- | sys/arch/alpha/alpha/dec_6600.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/fp_complete.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/interrupt.c | 5 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/machdep.c | 5 |
4 files changed, 5 insertions, 11 deletions
diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c index 3ca4b7a2df4..8f7b7c4452b 100644 --- a/sys/arch/alpha/alpha/dec_6600.c +++ b/sys/arch/alpha/alpha/dec_6600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_6600.c,v 1.6 2002/06/25 21:33:19 miod Exp $ */ +/* $OpenBSD: dec_6600.c,v 1.7 2004/07/06 21:53:59 deraadt Exp $ */ /* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */ /* @@ -106,7 +106,6 @@ dec_6600_cons_init() switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: /* serial console ... */ - assert(CTB_TURBOSLOT_HOSE(ctbslot) == 0); /* XXX */ { /* diff --git a/sys/arch/alpha/alpha/fp_complete.c b/sys/arch/alpha/alpha/fp_complete.c index 41d98b48c21..4971c0f3add 100644 --- a/sys/arch/alpha/alpha/fp_complete.c +++ b/sys/arch/alpha/alpha/fp_complete.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fp_complete.c,v 1.3 2003/12/22 19:59:37 jmc Exp $ */ +/* $OpenBSD: fp_complete.c,v 1.4 2004/07/06 21:53:59 deraadt Exp $ */ /* $NetBSD: fp_complete.c,v 1.5 2002/01/18 22:15:56 ross Exp $ */ /*- @@ -658,7 +658,6 @@ alpha_fp_complete(u_long a0, u_long a1, struct proc *p, u_int64_t *ucode) return SIGSEGV; } } - assert(win_begin <= pc && !((long)pc & 3)); inst = tsw[pc - win_begin]; op_class = 1UL << inst.generic_format.opcode; if (op_class & FPUREG_CLASS) { diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c index 49306f94b58..dbe895dac65 100644 --- a/sys/arch/alpha/alpha/interrupt.c +++ b/sys/arch/alpha/alpha/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.16 2004/06/28 02:28:42 aaron Exp $ */ +/* $OpenBSD: interrupt.c,v 1.17 2004/07/06 21:53:59 deraadt Exp $ */ /* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */ /*- @@ -435,9 +435,6 @@ softintr_init() (void (*)(void *))netintr, NULL); softclock_intrhand = softintr_establish(IPL_SOFTCLOCK, (void (*)(void *))softclock, NULL); - - assert(softnet_intrhand != NULL); - assert(softclock_intrhand != NULL); } /* diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index 633a8fca166..a8617bfd42a 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.88 2004/07/04 01:13:05 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.89 2004/07/06 21:53:59 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */ /*- @@ -390,10 +390,9 @@ nobootinfo: */ (*platform.cons_init)(); -#ifdef DIAGNOSTIC +#if 0 /* Paranoid sanity checking */ - /* We should always be running on the primary. */ assert(hwrpb->rpb_primary_cpu_id == alpha_pal_whami()); /* |