diff options
| author | jhb <jhb@FreeBSD.org> | 2005-11-22 22:54:42 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2005-11-22 22:54:42 +0000 |
| commit | 90e113054da951da0709805b546d5e30c8ef2be8 (patch) | |
| tree | 3a90f68506ba6c121261f5bf309b03541a1052d5 | |
| parent | 08b694daece31bcd0a6863b6e37238e3d412461d (diff) | |
| download | FreeBSD-src-90e113054da951da0709805b546d5e30c8ef2be8.zip FreeBSD-src-90e113054da951da0709805b546d5e30c8ef2be8.tar.gz | |
Make COUNT_IPIS and COUNT_XINVLTLB_HITS real kernel options and take
them out of machine/smptests.h.
| -rw-r--r-- | sys/conf/options.i386 | 2 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/i386/i386/apic_vector.s | 3 | ||||
| -rw-r--r-- | sys/i386/i386/mp_machdep.c | 2 | ||||
| -rw-r--r-- | sys/i386/include/smptests.h | 12 |
5 files changed, 7 insertions, 14 deletions
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 9e7c650..231437f 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -15,6 +15,8 @@ POWERFAIL_NMI opt_trap.h PPC_DEBUG opt_ppc.h PPC_PROBE_CHIPSET opt_ppc.h MP_WATCHDOG opt_mp_watchdog.h +COUNT_XINVLTLB_HITS opt_smp.h +COUNT_IPIS opt_smp.h # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 17d1f99..c2a9b2b 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -57,6 +57,8 @@ options MP_WATCHDOG # Debugging options. # options STOP_NMI # Stop CPUS using NMI instead of IPI +options COUNT_XINVLTLB_HITS # Counters for TLB events +options COUNT_IPIS # Per-CPU IPI interrupt counters diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s index 99b765f..b3bee69 100644 --- a/sys/i386/i386/apic_vector.s +++ b/sys/i386/i386/apic_vector.s @@ -36,9 +36,10 @@ * as well as IPI handlers. */ +#include "opt_smp.h" + #include <machine/asmacros.h> #include <machine/apicreg.h> -#include <machine/smptests.h> #include "assym.s" diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 336b4dd..5e56e49 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_kstack_pages.h" #include "opt_mp_watchdog.h" #include "opt_sched.h" +#include "opt_smp.h" #if !defined(lint) #if !defined(SMP) @@ -75,7 +76,6 @@ __FBSDID("$FreeBSD$"); #include <machine/mp_watchdog.h> #include <machine/pcb.h> #include <machine/smp.h> -#include <machine/smptests.h> /** COUNT_XINVLTLB_HITS */ #include <machine/specialreg.h> #include <machine/privatespace.h> diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h index 47b1009..054613b 100644 --- a/sys/i386/include/smptests.h +++ b/sys/i386/include/smptests.h @@ -33,16 +33,4 @@ * Various 'tests in progress' and configuration parameters. */ -/* - * TLB counters. - * -#define COUNT_XINVLTLB_HITS - */ - -/* - * Per-CPU IPI interrupt counters. - * -#define COUNT_IPIS - */ - #endif /* _MACHINE_SMPTESTS_H_ */ |
