diff options
-rw-r--r-- | sys/dev/hwpmc/hwpmc_amd.c | 3 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_intel.c | 3 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_mod.c | 2 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_pentium.c | 3 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_piv.c | 3 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_ppro.c | 3 | ||||
-rw-r--r-- | sys/hwpmc/hwpmc_amd.c | 3 | ||||
-rw-r--r-- | sys/hwpmc/hwpmc_intel.c | 3 | ||||
-rw-r--r-- | sys/hwpmc/hwpmc_mod.c | 2 | ||||
-rw-r--r-- | sys/hwpmc/hwpmc_pentium.c | 3 | ||||
-rw-r--r-- | sys/hwpmc/hwpmc_piv.c | 3 | ||||
-rw-r--r-- | sys/hwpmc/hwpmc_ppro.c | 3 |
12 files changed, 10 insertions, 24 deletions
diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index c3bb56c..a78943a 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -34,12 +34,11 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* AMD K7 and K8 PMCs */ diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c index 2448b37..3f6f330 100644 --- a/sys/dev/hwpmc/hwpmc_intel.c +++ b/sys/dev/hwpmc/hwpmc_intel.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> struct pmc_mdep * pmc_intel_initialize(void) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 13ddf0c..3f5cbd7 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -50,8 +50,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * Types diff --git a/sys/dev/hwpmc/hwpmc_pentium.c b/sys/dev/hwpmc/hwpmc_pentium.c index 9a02f41..48e8be3 100644 --- a/sys/dev/hwpmc/hwpmc_pentium.c +++ b/sys/dev/hwpmc/hwpmc_pentium.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * Intel Pentium PMCs diff --git a/sys/dev/hwpmc/hwpmc_piv.c b/sys/dev/hwpmc/hwpmc_piv.c index 8085a0e..de2ad70 100644 --- a/sys/dev/hwpmc/hwpmc_piv.c +++ b/sys/dev/hwpmc/hwpmc_piv.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * PENTIUM 4 SUPPORT diff --git a/sys/dev/hwpmc/hwpmc_ppro.c b/sys/dev/hwpmc/hwpmc_ppro.c index 3a289a5..c08c509 100644 --- a/sys/dev/hwpmc/hwpmc_ppro.c +++ b/sys/dev/hwpmc/hwpmc_ppro.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * PENTIUM PRO SUPPORT diff --git a/sys/hwpmc/hwpmc_amd.c b/sys/hwpmc/hwpmc_amd.c index c3bb56c..a78943a 100644 --- a/sys/hwpmc/hwpmc_amd.c +++ b/sys/hwpmc/hwpmc_amd.c @@ -34,12 +34,11 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* AMD K7 and K8 PMCs */ diff --git a/sys/hwpmc/hwpmc_intel.c b/sys/hwpmc/hwpmc_intel.c index 2448b37..3f6f330 100644 --- a/sys/hwpmc/hwpmc_intel.c +++ b/sys/hwpmc/hwpmc_intel.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> struct pmc_mdep * pmc_intel_initialize(void) diff --git a/sys/hwpmc/hwpmc_mod.c b/sys/hwpmc/hwpmc_mod.c index 13ddf0c..3f5cbd7 100644 --- a/sys/hwpmc/hwpmc_mod.c +++ b/sys/hwpmc/hwpmc_mod.c @@ -50,8 +50,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * Types diff --git a/sys/hwpmc/hwpmc_pentium.c b/sys/hwpmc/hwpmc_pentium.c index 9a02f41..48e8be3 100644 --- a/sys/hwpmc/hwpmc_pentium.c +++ b/sys/hwpmc/hwpmc_pentium.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * Intel Pentium PMCs diff --git a/sys/hwpmc/hwpmc_piv.c b/sys/hwpmc/hwpmc_piv.c index 8085a0e..de2ad70 100644 --- a/sys/hwpmc/hwpmc_piv.c +++ b/sys/hwpmc/hwpmc_piv.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * PENTIUM 4 SUPPORT diff --git a/sys/hwpmc/hwpmc_ppro.c b/sys/hwpmc/hwpmc_ppro.c index 3a289a5..c08c509 100644 --- a/sys/hwpmc/hwpmc_ppro.c +++ b/sys/hwpmc/hwpmc_ppro.c @@ -30,14 +30,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pmc.h> #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> #include <machine/cputypes.h> #include <machine/md_var.h> -#include <machine/pmc_mdep.h> -#include <machine/specialreg.h> /* * PENTIUM PRO SUPPORT |