Module Name: src
Committed By: mrg
Date: Thu Jun 17 06:40:28 UTC 2010
Modified Files:
src/sys/arch/x86/x86: intr.c
Log Message:
attach just one of the cpu timer interrupts as EVCNT_TYPE_INTR, so that at
least something shows up in systat and beyond. myself, and a few others,
have been confused at the lack of any timer interrupts appearing here.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/x86/x86/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.67 src/sys/arch/x86/x86/intr.c:1.68
--- src/sys/arch/x86/x86/intr.c:1.67 Wed Feb 24 21:22:01 2010
+++ src/sys/arch/x86/x86/intr.c Thu Jun 17 06:40:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.67 2010/02/24 21:22:01 dyoung Exp $ */
+/* $NetBSD: intr.c,v 1.68 2010/06/17 06:40:28 mrg Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.67 2010/02/24 21:22:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.68 2010/06/17 06:40:28 mrg Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -983,6 +983,7 @@
struct intrsource *isp;
#if NLAPIC > 0 && defined(MULTIPROCESSOR)
int i;
+ static int first = 1;
#endif
#ifdef INTRSTACKSIZE
vaddr_t istack;
@@ -997,8 +998,10 @@
isp->is_handlers = &fake_timer_intrhand;
isp->is_pic = &local_pic;
ci->ci_isources[LIR_TIMER] = isp;
- evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_MISC, NULL,
+ evcnt_attach_dynamic(&isp->is_evcnt,
+ first ? EVCNT_TYPE_INTR : EVCNT_TYPE_MISC, NULL,
device_xname(ci->ci_dev), "timer");
+ first = 0;
#ifdef MULTIPROCESSOR
isp = kmem_zalloc(sizeof(*isp), KM_SLEEP);
