Page MenuHomeFreeBSD
Files F141007699

D38452.id.diff
No OneTemporary
Actions

D38452.id.diff
View Options

diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -94,13 +94,11 @@
struct powerpc_intr {
struct intr_event *event;
- long *cntp;
void *priv; /* PIC-private data */
device_t pic;
u_int irq;
u_int intline;
u_int vector;
- u_int cntindex;
int fwcode;
int ipi;
int pi_domain;
@@ -172,7 +170,7 @@
powerpc_intrs = mallocarray(num_io_irqs, sizeof(*powerpc_intrs),
M_INTR, M_WAITOK | M_ZERO);
- nintrcnt = 1 + num_io_irqs * 2 + mp_ncpus * 2;
+ nintrcnt = 1 + mp_ncpus * 2;
#ifdef COUNT_IPIS
if (mp_ncpus > 1)
nintrcnt += 8 * mp_ncpus;
@@ -222,7 +220,6 @@
static struct powerpc_intr *
intr_lookup(u_int irq)
{
- char intrname[16];
struct powerpc_intr *i, *iscan;
int vector;
@@ -242,7 +239,6 @@
}
i->event = NULL;
- i->cntp = NULL;
i->priv = NULL;
i->trig = INTR_TRIGGER_CONFORM;
i->pol = INTR_POLARITY_CONFORM;
@@ -270,10 +266,6 @@
if (iscan == NULL && i->vector != -1) {
powerpc_intrs[i->vector] = i;
- i->cntindex = nintrcnt - 1;
- i->cntp = &intrcnt[i->cntindex];
- sprintf(intrname, "irq%u:", i->irq);
- intrcnt_setname(intrname, i->cntindex);
nvectors++;
}
mtx_unlock(&intr_table_lock);
@@ -541,9 +533,6 @@
CPU_ZERO(&i->pi_cpuset);
CPU_COPY(&cpuset_domain[domain], &i->pi_cpuset);
}
- mtx_lock(&intr_table_lock);
- intrcnt_setname(i->event->ie_fullname, i->cntindex);
- mtx_unlock(&intr_table_lock);
if (!cold) {
error = powerpc_map_irq(i);
@@ -639,8 +628,6 @@
if (i == NULL)
goto stray;
- (*i->cntp)++;
-
ie = i->event;
KASSERT(ie != NULL, ("%s: interrupt without an event", __func__));

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 4:47 PM (2 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27384147
Default Alt Text
D38452.id.diff (1 KB)

Event Timeline