summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2008-04-25 19:50:09 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2008-04-25 19:50:09 +0000
commit7554e62dcbd942dff3d7045b4e00f441d140f33a (patch)
treef471e3c57931907a75719227fa658ee926557a7e /sys/arch/i386/include
parent0ac852d05adeba5c03d31aa5d8fdbb5fccd56a47 (diff)
Make ipending per-cpu. Should fix PR 5788.
ok weingart@
Diffstat (limited to 'sys/arch/i386/include')
-rw-r--r--sys/arch/i386/include/intr.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index d6b5a187800..5a701e1ca90 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.33 2007/09/07 08:37:38 art Exp $ */
+/* $OpenBSD: intr.h,v 1.34 2008/04/25 19:50:08 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */
/*
@@ -45,7 +45,6 @@
extern volatile u_int32_t lapic_tpr; /* Current interrupt priority level. */
-extern volatile u_int32_t ipending; /* Interrupts pending. */
extern int imask[]; /* Bitmasks telling what interrupts are blocked. */
extern int iunmask[]; /* Bitmasks telling what interrupts are accepted. */
@@ -99,7 +98,7 @@ void splassert_check(int, const char *);
#define _SPLX(ncpl) \
lapic_tpr = ncpl; \
- if (ipending & IUNMASK(ncpl)) \
+ if (curcpu()->ci_ipending & IUNMASK(ncpl)) \
Xspllower()
/*