summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/tc/ioasic.c15
-rw-r--r--sys/arch/alpha/tc/tc_3000_300.c15
-rw-r--r--sys/arch/alpha/tc/tc_3000_500.c15
3 files changed, 18 insertions, 27 deletions
diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c
index 6c44ccee234..ae84d535e64 100644
--- a/sys/arch/alpha/tc/ioasic.c
+++ b/sys/arch/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioasic.c,v 1.11 2004/06/28 02:28:43 aaron Exp $ */
+/* $OpenBSD: ioasic.c,v 1.12 2006/03/04 12:33:17 miod Exp $ */
/* $NetBSD: ioasic.c,v 1.34 2000/07/18 06:10:06 thorpej Exp $ */
/*-
@@ -124,6 +124,7 @@ struct ioasicintr {
int (*iai_func)(void *);
void *iai_arg;
struct evcount iai_count;
+ char iai_name[16];
} ioasicintrs[IOASIC_NCOOKIES];
tc_addr_t ioasic_base; /* XXX XXX XXX */
@@ -163,7 +164,6 @@ ioasicattach(parent, self, aux)
u_long ssr;
#endif
u_long i, imsk;
- char *cp;
ioasicfound = 1;
@@ -202,13 +202,10 @@ ioasicattach(parent, self, aux)
for (i = 0; i < IOASIC_NCOOKIES; i++) {
ioasicintrs[i].iai_func = ioasic_intrnull;
ioasicintrs[i].iai_arg = (void *)i;
-
- cp = malloc(12, M_DEVBUF, M_NOWAIT);
- if (cp == NULL)
- panic("ioasicattach");
- snprintf(cp, 12, "slot %lu", i);
- evcount_attach(&ioasicintrs[i].iai_count, self->dv_xname, NULL,
- &evcount_intr);
+ snprintf(ioasicintrs[i].iai_name,
+ sizeof ioasicintrs[i].iai_name, "ioasic slot %u", i);
+ evcount_attach(&ioasicintrs[i].iai_count,
+ ioasicintrs[i].iai_name, NULL, &evcount_intr);
}
tc_intr_establish(parent, ta->ta_cookie, TC_IPL_NONE, ioasic_intr, sc);
diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c
index 08c26d6ad6f..fe6940fa6f9 100644
--- a/sys/arch/alpha/tc/tc_3000_300.c
+++ b/sys/arch/alpha/tc/tc_3000_300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tc_3000_300.c,v 1.11 2004/06/28 02:28:43 aaron Exp $ */
+/* $OpenBSD: tc_3000_300.c,v 1.12 2006/03/04 12:33:17 miod Exp $ */
/* $NetBSD: tc_3000_300.c,v 1.26 2001/07/27 00:25:21 thorpej Exp $ */
/*
@@ -85,13 +85,13 @@ struct tcintr {
int (*tci_func)(void *);
void *tci_arg;
struct evcount tci_count;
+ char tci_name[12];
} tc_3000_300_intr[TC_3000_300_NCOOKIES];
void
tc_3000_300_intr_setup()
{
volatile u_int32_t *imskp;
- char *cp;
u_long i;
/*
@@ -106,13 +106,10 @@ tc_3000_300_intr_setup()
for (i = 0; i < TC_3000_300_NCOOKIES; i++) {
tc_3000_300_intr[i].tci_func = tc_3000_300_intrnull;
tc_3000_300_intr[i].tci_arg = (void *)i;
-
- cp = malloc(12, M_DEVBUF, M_NOWAIT);
- if (cp == NULL)
- panic("tc_3000_300_intr_setup");
- snprintf(cp, 12, "slot %lu", i);
- evcount_attach(&tc_3000_300_intr[i].tci_count, "tc", NULL,
- &evcount_intr);
+ snprintf(tc_3000_300_intr[i].tci_name,
+ sizeof tc_3000_300_intr[i].tci_name, "tc slot %u", i);
+ evcount_attach(&tc_3000_300_intr[i].tci_count,
+ tc_3000_300_intr[i].tci_name, NULL, &evcount_intr);
}
}
diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c
index 94aee0a09cd..10b7807f481 100644
--- a/sys/arch/alpha/tc/tc_3000_500.c
+++ b/sys/arch/alpha/tc/tc_3000_500.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tc_3000_500.c,v 1.12 2004/06/28 02:28:43 aaron Exp $ */
+/* $OpenBSD: tc_3000_500.c,v 1.13 2006/03/04 12:33:17 miod Exp $ */
/* $NetBSD: tc_3000_500.c,v 1.24 2001/07/27 00:25:21 thorpej Exp $ */
/*
@@ -104,6 +104,7 @@ struct tcintr {
int (*tci_func)(void *);
void *tci_arg;
struct evcount tci_count;
+ char tci_name[12];
} tc_3000_500_intr[TC_3000_500_NCOOKIES];
u_int32_t tc_3000_500_imask; /* intrs we want to ignore; mirrors IMR. */
@@ -111,7 +112,6 @@ u_int32_t tc_3000_500_imask; /* intrs we want to ignore; mirrors IMR. */
void
tc_3000_500_intr_setup()
{
- char *cp;
u_long i;
/*
@@ -130,13 +130,10 @@ tc_3000_500_intr_setup()
for (i = 0; i < TC_3000_500_NCOOKIES; i++) {
tc_3000_500_intr[i].tci_func = tc_3000_500_intrnull;
tc_3000_500_intr[i].tci_arg = (void *)i;
-
- cp = malloc(12, M_DEVBUF, M_NOWAIT);
- if (cp == NULL)
- panic("tc_3000_500_intr_setup");
- snprintf(cp, 12, "slot %lu", i);
- evcount_attach(&tc_3000_500_intr[i].tci_count, "tc", NULL,
- &evcount_intr);
+ snprintf(tc_3000_500_intr[i].tci_name,
+ sizeof tc_3000_500_intr[i].tci_name, "tc slot %u", i);
+ evcount_attach(&tc_3000_500_intr[i].tci_count,
+ tc_3000_500_intr[i].tci_name, NULL, &evcount_intr);
}
}