Include <sys/pmc.h> instead of <machine/pmc_mdep.h>. The MI header

includes the MD header for us. Do not include <machine/specialreg.h>
as it is not a header file that can be included from MI files. It
is included from <machine/pmc_mdep.h> if so needed and possible.

Ok'd: jkoshy@

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

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)

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

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

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

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

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

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)

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

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

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

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