diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2011-04-05 15:30:46 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2011-04-05 15:30:46 +0000 |
| commit | f789e475c931d9b33427a75938953056fe0463be (patch) | |
| tree | 4e620417116ad349445dddc226422c63eab44612 /sys/arch | |
| parent | c0f55b3c1cc3adf0af8492b86177020dc365cbc3 (diff) | |
Fix logic bug in debug code and enable spllower()/splraise().
ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hppa64/hppa64/intr.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa64/hppa64/locore.S | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sys/arch/hppa64/hppa64/intr.c b/sys/arch/hppa64/hppa64/intr.c index 3403f5c13f3..038613617d3 100644 --- a/sys/arch/hppa64/hppa64/intr.c +++ b/sys/arch/hppa64/hppa64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.2 2010/07/02 23:24:21 jsing Exp $ */ +/* $OpenBSD: intr.c,v 1.3 2011/04/05 15:30:45 jsing Exp $ */ /* * Copyright (c) Joel Sing <jsing@openbsd.org> @@ -20,7 +20,7 @@ #include <machine/intr.h> -volatile u_long imask; +volatile u_long imask[NIPL]; void * softintr_establish(int pri, void (*handler)(void *), void *arg) diff --git a/sys/arch/hppa64/hppa64/locore.S b/sys/arch/hppa64/hppa64/locore.S index 8cfe90171ae..5314ffadc91 100644 --- a/sys/arch/hppa64/hppa64/locore.S +++ b/sys/arch/hppa64/hppa64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.13 2011/04/05 12:56:02 jsing Exp $ */ +/* $OpenBSD: locore.S,v 1.14 2011/04/05 15:30:45 jsing Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -1680,12 +1680,9 @@ EXIT(curcpu) * int splraise(int newcpl); */ LEAF_ENTRY(splraise) - bv %r0(%rp) - nop - extrd,u %arg0, 63, 32, %arg0 #ifdef DEBUG - cmpib,<=,n NIPL, %arg0, splraise_ok + cmpib,>,n NIPL, %arg0, splraise_ok copy %arg0, %arg1 ldil L%splraise_fmt, %arg0 b,l panic, %rp @@ -1717,12 +1714,9 @@ EXIT(splraise) * int spllower(int newcpl); */ LEAF_ENTRY(spllower) - bv %r0(%rp) - nop - extrd,u %arg0, 63, 32, %arg0 #ifdef DEBUG - cmpib,<=,n NIPL, %arg0, spllower_ok + cmpib,>,n NIPL, %arg0, spllower_ok copy %arg0, %arg1 ldil L%spllower_fmt, %arg0 b,l panic, %rp |