summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2009-10-16 12:00:59 +0000
committerkib <kib@FreeBSD.org>2009-10-16 12:00:59 +0000
commit2892f80896c5939a96617bd5f959b8bd80b38704 (patch)
treea4a547bd0558a5dae450835efa1313e8b541b7b3 /sys/i386
parenta1878de77cd21b152dd66c09c2e2aebbe924b95f (diff)
downloadFreeBSD-src-2892f80896c5939a96617bd5f959b8bd80b38704.zip
FreeBSD-src-2892f80896c5939a96617bd5f959b8bd80b38704.tar.gz
Move intr_describe() out of #ifdef SMP; the function is always required.
Reviewed by: jhb
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/i386/intr_machdep.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/i386/i386/intr_machdep.c b/sys/i386/i386/intr_machdep.c
index 5a74a9d..75be205 100644
--- a/sys/i386/i386/intr_machdep.c
+++ b/sys/i386/i386/intr_machdep.c
@@ -366,6 +366,23 @@ intr_init(void *dummy __unused)
}
SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL);
+/* Add a description to an active interrupt handler. */
+int
+intr_describe(u_int vector, void *ih, const char *descr)
+{
+ struct intsrc *isrc;
+ int error;
+
+ isrc = intr_lookup_source(vector);
+ if (isrc == NULL)
+ return (EINVAL);
+ error = intr_event_describe_handler(isrc->is_event, ih, descr);
+ if (error)
+ return (error);
+ intrcnt_updatename(isrc);
+ return (0);
+}
+
#ifdef DDB
/*
* Dump data about interrupt handlers
@@ -432,23 +449,6 @@ intr_bind(u_int vector, u_char cpu)
return (intr_event_bind(isrc->is_event, cpu));
}
-/* Add a description to an active interrupt handler. */
-int
-intr_describe(u_int vector, void *ih, const char *descr)
-{
- struct intsrc *isrc;
- int error;
-
- isrc = intr_lookup_source(vector);
- if (isrc == NULL)
- return (EINVAL);
- error = intr_event_describe_handler(isrc->is_event, ih, descr);
- if (error)
- return (error);
- intrcnt_updatename(isrc);
- return (0);
-}
-
/*
* Add a CPU to our mask of valid CPUs that can be destinations of
* interrupts.
OpenPOWER on IntegriCloud