D37869.id114531.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D37869.id114531.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
	@@ -172,7 +172,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 = num_io_irqs * 2 + mp_ncpus * 2;
	#ifdef COUNT_IPIS
	if (mp_ncpus > 1)
	nintrcnt += 8 * mp_ncpus;
	@@ -183,9 +183,6 @@
	M_ZERO);
	sintrcnt = nintrcnt * sizeof(u_long);
	sintrnames = nintrcnt * (MAXCOMLEN + 1);
	-
	- intrcnt_setname("???", 0);
	- intrcnt_index = 1;
	}
	/*
	* This needs to happen before SI_SUB_CPU
	diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
	--- a/sys/x86/x86/intr_machdep.c
	+++ b/sys/x86/x86/intr_machdep.c
	@@ -176,13 +176,12 @@
	#endif

	/*
	- * - 1 ??? dummy counter.
	* - 2 counters for each I/O interrupt.
	* - 1 counter for each CPU for lapic timer.
	* - 1 counter for each CPU for the Hyper-V vmbus driver.
	* - 8 counters for each CPU for IPI counters for SMP.
	*/
	- nintrcnt = 1 + num_io_irqs * 2 + mp_ncpus * 2;
	+ nintrcnt = num_io_irqs * 2 + mp_ncpus * 2;
	#ifdef COUNT_IPIS
	if (mp_ncpus > 1)
	nintrcnt += 8 * mp_ncpus;
	@@ -194,9 +193,6 @@
	sintrcnt = nintrcnt * sizeof(u_long);
	sintrnames = nintrcnt * (MAXCOMLEN + 1);

	- intrcnt_setname("???", 0);
	- intrcnt_index = 1;
	-
	/*
	* NB: intrpic_lock is not held here to avoid LORs due to
	* malloc() in intr_register_source(). However, we are still