summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hppa/hppa/intr.c4
-rw-r--r--sys/arch/hppa/include/intr.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/hppa/hppa/intr.c b/sys/arch/hppa/hppa/intr.c
index 5c1c1bf86b7..109c2a0067c 100644
--- a/sys/arch/hppa/hppa/intr.c
+++ b/sys/arch/hppa/hppa/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.45 2015/02/11 01:36:13 miod Exp $ */
+/* $OpenBSD: intr.c,v 1.46 2015/02/11 01:55:40 dlg Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -384,5 +384,5 @@ softintr_schedule(void *cookie)
{
struct hppa_iv *iv = cookie;
- softintr(1 << (iv->pri - 1));
+ atomic_setbits_long(&curcpu()->ci_ipending, 1 << (iv->pri - 1));
}
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index 2cf1052acf2..11ffb7023e1 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.40 2014/06/03 13:30:24 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.41 2015/02/11 01:55:40 dlg Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -148,8 +148,6 @@ hppa_intr_enable(register_t eiem)
#define splipi() splraise(IPL_IPI)
#define spl0() spllower(IPL_NONE)
-#define softintr(mask) atomic_setbits_long(&curcpu()->ci_ipending, mask)
-
#define SOFTINT_MASK ((1 << (IPL_SOFTCLOCK - 1)) | \
(1 << (IPL_SOFTNET - 1)) | (1 << (IPL_SOFTTTY - 1)))