Make COUNT_IPIS and COUNT_XINVLTLB_HITS real kernel options and take

them out of machine/smptests.h.

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

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
 
 
 

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"
 

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>
 

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_ */