Make vmstat -i work:

o  Properly set the pointer to the counter for each interrupt and
   update the intrnames table.
o  Remove Alpha cruft from intrcnt.h.
o  Create INTRNAME_LEN as the single entity that defines the width
   of the names in the intrnames table (incl. terminatinf '\0').

1 files changed, 8 insertions, 37 deletions

diff --git a/sys/ia64/include/intrcnt.h b/sys/ia64/include/intrcnt.h
index 4f7dcf4..bb1830e 100644
--- a/sys/ia64/include/intrcnt.h
+++ b/sys/ia64/include/intrcnt.h
@@ -33,41 +33,12 @@
 #define	INTRCNT_ISA_IRQ_LEN	16
 #define	INTRCNT_OTHER_BASE	(INTRCNT_ISA_IRQ + INTRCNT_ISA_IRQ_LEN)
 #define	INTRCNT_OTHER_LEN	48
-#define	INTRCNT_COUNT (INTRCNT_OTHER_BASE + INTRCNT_OTHER_LEN)
+#define	INTRCNT_COUNT		(INTRCNT_OTHER_BASE + INTRCNT_OTHER_LEN)
 
-#define	INTRCNT_A12_IRQ			INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_1000A_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_1000_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_2100_A500_IRQ	INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_550_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_EB164_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_EB64PLUS_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_EB66_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_IOASIC			INTRCNT_OTHER_BASE
-#define	INTRCNT_KN15			INTRCNT_OTHER_BASE
-#define	INTRCNT_KN16			INTRCNT_OTHER_BASE
-#define	INTRCNT_KN20AA_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_KN300_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_KN8AE_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_TCDS			INTRCNT_OTHER_BASE
-
-#define	INTRCNT_A12_IRQ_LEN		10
-#define	INTRCNT_DEC_1000A_IRQ_LEN	32
-#define	INTRCNT_DEC_1000_IRQ_LEN	16
-#define	INTRCNT_DEC_2100_A500_IRQ_LEN	16
-#define	INTRCNT_DEC_550_IRQ_LEN		48
-#define	INTRCNT_EB164_IRQ_LEN		24
-#define	INTRCNT_EB64PLUS_IRQ_LEN	32
-#define	INTRCNT_EB66_IRQ_LEN		32
-#define	INTRCNT_IOASIC_LEN		4
-#define	INTRCNT_ISA_IRQ_LEN		16
-#define	INTRCNT_KN15_LEN		9
-#define	INTRCNT_KN16_LEN		5
-#define	INTRCNT_KN20AA_IRQ_LEN		32
-#define	INTRCNT_KN300_LEN		19
-#define	INTRCNT_KN8AE_IRQ_LEN		2
-#define	INTRCNT_TCDS_LEN		2
-
-#	define	INTRCNT_KN300_NCR810	INTRCNT_KN300_IRQ + 16
-#	define	INTRCNT_KN300_I2C_CTRL	INTRCNT_KN300_IRQ + 17
-#	define	INTRCNT_KN300_I2C_BUS	INTRCNT_KN300_IRQ + 18
+/*
+ * Maximum name length in intrnames table (including terminating '\0'.
+ * Since vmstat(8) assumes a maximum length of 13 (including '\0'), we're
+ * pretty much limited to that (unless we don't care about the alignment
+ * of the columns :-)
+ */
+#define INTRNAME_LEN		13