summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2008-06-22 17:33:41 +0000
committertsutsui <tsutsui@NetBSD.org>2008-06-22 17:33:41 +0000
commitaecc2565d0fe146636ff9fb00a47ea97967cda7d (patch)
treed0d91d6e220a550c518e019a6363aa5acb47cbc9
parent152476802fe3a61469bc30a03edb0b504e27277f (diff)
Make cpu_intr_p() inline.
-rw-r--r--sys/arch/hp300/hp300/intr.c11
-rw-r--r--sys/arch/hp300/include/intr.h10
-rw-r--r--sys/arch/news68k/include/intr.h10
-rw-r--r--sys/arch/news68k/news68k/isr.c11
-rw-r--r--sys/arch/sun68k/include/intr.h10
-rw-r--r--sys/arch/sun68k/sun68k/isr.c11
6 files changed, 33 insertions, 30 deletions
diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c
index 1f3691dd95e..b8efcbcbe01 100644
--- a/sys/arch/hp300/hp300/intr.c
+++ b/sys/arch/hp300/hp300/intr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.36 2008/06/22 16:29:36 tsutsui Exp $ */
+/* $NetBSD: intr.c,v 1.37 2008/06/22 17:35:14 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.36 2008/06/22 16:29:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.37 2008/06/22 17:35:14 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@@ -223,10 +223,3 @@ intr_dispatch(int evec /* format | vector offset */)
idepth--;
}
-
-bool
-cpu_intr_p(void)
-{
-
- return idepth != 0;
-}
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index 8579fc61f29..3bf861fa099 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.30 2008/06/22 16:29:36 tsutsui Exp $ */
+/* $NetBSD: intr.h,v 1.31 2008/06/22 17:35:14 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -63,6 +63,14 @@
#define IPLTOPSL(x) ((((x) & 0xf) << 8) | PSL_S)
extern int idepth;
+
+static inline bool
+cpu_intr_p(void)
+{
+
+ return idepth != 0;
+}
+
extern const uint16_t ipl2psl_table[NIPL];
typedef int ipl_t;
diff --git a/sys/arch/news68k/include/intr.h b/sys/arch/news68k/include/intr.h
index 387099fb641..e2d9bf26378 100644
--- a/sys/arch/news68k/include/intr.h
+++ b/sys/arch/news68k/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.22 2008/06/15 07:20:46 tsutsui Exp $ */
+/* $NetBSD: intr.h,v 1.23 2008/06/22 17:33:41 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,6 +48,14 @@
#define NIPL 8
extern int idepth;
+
+static inline bool
+cpu_intr_p(void)
+{
+
+ return idepth != 0;
+}
+
extern const uint16_t ipl2psl_table[NIPL];
typedef int ipl_t;
diff --git a/sys/arch/news68k/news68k/isr.c b/sys/arch/news68k/news68k/isr.c
index 311bab40ed1..754e0c50245 100644
--- a/sys/arch/news68k/news68k/isr.c
+++ b/sys/arch/news68k/news68k/isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.18 2008/06/15 07:20:46 tsutsui Exp $ */
+/* $NetBSD: isr.c,v 1.19 2008/06/22 17:33:41 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.18 2008/06/15 07:20:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.19 2008/06/22 17:33:41 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -269,13 +269,6 @@ isrdispatch_vectored(int pc, int evec, void *frame)
idepth--;
}
-bool
-cpu_intr_p(void)
-{
-
- return idepth != 0;
-}
-
void
isrlink_custom(int level, void *handler)
{
diff --git a/sys/arch/sun68k/include/intr.h b/sys/arch/sun68k/include/intr.h
index 293a3c473ce..70af1b7a3f6 100644
--- a/sys/arch/sun68k/include/intr.h
+++ b/sys/arch/sun68k/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.19 2008/06/15 07:23:26 tsutsui Exp $ */
+/* $NetBSD: intr.h,v 1.20 2008/06/22 17:34:25 tsutsui Exp $ */
/*
* Copyright (c) 2001 Matt Fredette.
@@ -58,6 +58,14 @@
#ifdef _KERNEL
extern int idepth;
+
+static inline bool
+cpu_intr_p(void)
+{
+
+ return idepth != 0;
+}
+
extern const uint16_t ipl2psl_table[NIPL];
typedef int ipl_t;
diff --git a/sys/arch/sun68k/sun68k/isr.c b/sys/arch/sun68k/sun68k/isr.c
index 561e56384b6..3c67b068eac 100644
--- a/sys/arch/sun68k/sun68k/isr.c
+++ b/sys/arch/sun68k/sun68k/isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.22 2008/06/15 07:23:26 tsutsui Exp $ */
+/* $NetBSD: isr.c,v 1.23 2008/06/22 17:34:25 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.22 2008/06/15 07:23:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.23 2008/06/22 17:34:25 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,13 +230,6 @@ isr_add_vectored(isr_func_t func, void *arg, int level, int vec)
set_vector_entry(vec, (void *)_isr_vectored);
}
-bool
-cpu_intr_p(void)
-{
-
- return idepth != 0;
-}
-
/*
* XXX - could just kill these...
*/