diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-22 18:31:52 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-22 18:31:52 +0000 |
| commit | bd09e9d301e11f4ac74daaa0581b23c5067d7fab (patch) | |
| tree | 60eee1501e30d76a3daa4955b0d2cc0433d93901 /sys/arch/mips64 | |
| parent | 63facbc2507d3a4f540ad886cedc99810928b6d8 (diff) | |
Remove a never hit debug panic I commited by accident sometime ago.
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/context.S | 6 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/trap.c | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/sys/arch/mips64/mips64/context.S b/sys/arch/mips64/mips64/context.S index c9a66c86b7f..d0ea024c45b 100644 --- a/sys/arch/mips64/mips64/context.S +++ b/sys/arch/mips64/mips64/context.S @@ -1,4 +1,4 @@ -/* $OpenBSD: context.S,v 1.27 2009/10/22 18:23:12 miod Exp $ */ +/* $OpenBSD: context.S,v 1.28 2009/10/22 18:31:51 miod Exp $ */ /* * Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -128,9 +128,11 @@ NON_LEAF(cpu_switchto, FRAMESZ(CF_SZ), ra) REG_S s7, PCB_CONTEXT+7*REGSZ(t3) REG_S s8, PCB_CONTEXT+9*REGSZ(t3) REG_S ra, PCB_CONTEXT+10*REGSZ(t3) - cfc0 t1, COP_0_ICR REG_S v0, PCB_CONTEXT+11*REGSZ(t3) +#ifndef IMASK_EXTERNAL + cfc0 t1, COP_0_ICR REG_S t1, PCB_CONTEXT+12*REGSZ(t3) +#endif REG_S t0, PCB_CONTEXT+13*REGSZ(t3) 1: diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index a0f44b6bd86..54a37bd7c23 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,5 +1,4 @@ -/* $OpenBSD: trap.c,v 1.44 2009/08/06 21:05:49 miod Exp $ */ -/* tracked to 1.23 */ +/* $OpenBSD: trap.c,v 1.45 2009/10/22 18:31:51 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -43,9 +42,6 @@ * from: @(#)trap.c 8.5 (Berkeley) 1/11/94 */ -/* - * THIS CODE SHOULD BE REWRITTEN! - */ #include <sys/param.h> #include <sys/systm.h> @@ -174,8 +170,6 @@ ast() uvmexp.softs++; -if (p->p_md.md_astpending == 0) -panic("unexpected ast p %p astpending %p\n", p, &p->p_md.md_astpending); p->p_md.md_astpending = 0; if (p->p_flag & P_OWEUPC) { ADDUPROF(p); |