Catch up to moving headers:

- machine/ipl.h -> sys/ipl.h
- machine/mutex.h -> sys/mutex.h

8 files changed, 11 insertions, 12 deletions

diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index af46cd6..a875d54 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -37,6 +37,7 @@
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h> /* for BASE_SLICE, MAX_SLICES */
+#include <sys/ipl.h>
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
@@ -45,7 +46,6 @@
 #include <sys/devicestat.h>
 #include <sys/cons.h>
 
-#include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/cpuconf.h>
 #include <machine/rpb.h>
diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c
index 6b47e29..aaa80b1 100644
--- a/sys/alpha/alpha/db_interface.c
+++ b/sys/alpha/alpha/db_interface.c
@@ -59,13 +59,13 @@
 #include <sys/kernel.h>
 #include <sys/cons.h>
 #include <sys/ktr.h>
+#include <sys/mutex.h>
 
 #include <vm/vm.h>
 
 #include <machine/db_machdep.h>
 #include <machine/pal.h>
 #include <machine/prom.h>
-#include <machine/mutex.h>
 #include <machine/smp.h>
 
 #include <alpha/alpha/db_instruction.h>
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index 194b35f..42ea585 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -49,6 +49,7 @@
 #include <sys/ipl.h>
 #include <sys/kthread.h>
 #include <sys/ktr.h>
+#include <sys/mutex.h>
 #include <sys/unistd.h>
 
 #include <machine/reg.h>
@@ -56,7 +57,6 @@
 #include <machine/cpuconf.h>
 #include <machine/bwx.h>
 #include <machine/intr.h>
-#include <machine/mutex.h>
 #include <machine/rpb.h>
 
 #ifdef EVCNT_COUNTERS
diff --git a/sys/alpha/alpha/ipl_funcs.c b/sys/alpha/alpha/ipl_funcs.c
index b83656e..e110c83 100644
--- a/sys/alpha/alpha/ipl_funcs.c
+++ b/sys/alpha/alpha/ipl_funcs.c
@@ -31,13 +31,13 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/ipl.h>
 #include <sys/ktr.h>
+#include <sys/mutex.h>
 #include <sys/interrupt.h>
-#include <machine/ipl.h>
 #include <machine/cpu.h>
 #include <machine/globaldata.h>
 #include <machine/globals.h>
-#include <machine/mutex.h>
 #include <net/netisr.h>
 
 #include "sio.h"
diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index 69170fc..6514229 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/sys/alpha/alpha/mp_machdep.c
@@ -28,11 +28,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/mutex.h>
+#include <sys/ipl.h>
 #include <sys/ktr.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
@@ -45,7 +46,6 @@
 #include <machine/smp.h>
 #include <machine/lock.h>
 #include <machine/atomic.h>
-#include <machine/ipl.h>
 #include <machine/globaldata.h>
 #include <machine/pmap.h>
 #include <machine/rpb.h>
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index 79019bd..f53fe7c 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -35,13 +35,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/mutex.h>
 #include <sys/ktr.h>
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/vmmeter.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
@@ -60,7 +60,6 @@
 #include <machine/pal.h>
 #include <machine/fpu.h>
 #include <machine/smp.h>
-#include <machine/mutex.h>
 
 #ifdef KTRACE
 #include <sys/uio.h>
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index f706590..c766291 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -73,6 +73,7 @@
 #include <sys/malloc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/mutex.h>
 #include <sys/vnode.h>
 #include <sys/vmmeter.h>
 #include <sys/kernel.h>
@@ -84,7 +85,6 @@
 #include <machine/fpu.h>
 #include <machine/md_var.h>
 #include <machine/prom.h>
-#include <machine/mutex.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/alpha/include/smp.h b/sys/alpha/include/smp.h
index 00aec6a..2c208c8 100644
--- a/sys/alpha/include/smp.h
+++ b/sys/alpha/include/smp.h
@@ -15,9 +15,9 @@
 
 #ifdef _KERNEL
 
-#include <machine/mutex.h>
-#include <machine/ipl.h>
+#include <sys/ipl.h>
 #include <sys/ktr.h>
+#include <sys/mutex.h>
 
 #ifndef LOCORE