From af565edaaaa47de39f3edcebd83e42fcef361de1 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Fri, 2 Jul 2010 17:22:15 +0000 Subject: [PATCH] Revert r209638. After commit, there appeared to be more people who liked previous name of stray interrupt counters, then responded to the list. --- sys/amd64/amd64/intr_machdep.c | 4 ++-- sys/i386/i386/intr_machdep.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/intr_machdep.c b/sys/amd64/amd64/intr_machdep.c index 3f1c2c29468..3cdc69fc156 100644 --- a/sys/amd64/amd64/intr_machdep.c +++ b/sys/amd64/amd64/intr_machdep.c @@ -346,8 +346,8 @@ intrcnt_register(struct intsrc *is) mtx_lock_spin(&intrcnt_lock); is->is_index = intrcnt_index; intrcnt_index += 2; - snprintf(straystr, MAXCOMLEN + 1, "%s stray", - is->is_event->ie_name); + snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", + is->is_pic->pic_vector(is)); intrcnt_updatename(is); is->is_count = &intrcnt[is->is_index]; intrcnt_setname(straystr, is->is_index + 1); diff --git a/sys/i386/i386/intr_machdep.c b/sys/i386/i386/intr_machdep.c index 4e30df8d25f..35179fab99b 100644 --- a/sys/i386/i386/intr_machdep.c +++ b/sys/i386/i386/intr_machdep.c @@ -334,8 +334,8 @@ intrcnt_register(struct intsrc *is) mtx_lock_spin(&intrcnt_lock); is->is_index = intrcnt_index; intrcnt_index += 2; - snprintf(straystr, MAXCOMLEN + 1, "%s stray", - is->is_event->ie_name); + snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", + is->is_pic->pic_vector(is)); intrcnt_updatename(is); is->is_count = &intrcnt[is->is_index]; intrcnt_setname(straystr, is->is_index + 1);