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

diff --git a/sys/arch/amd64/amd64/genassym.cf b/sys/arch/amd64/amd64/genassym.cf
index 80bc03c..88f0212 100644 (file)
--- a/sys/arch/amd64/amd64/genassym.cf
+++ b/sys/arch/amd64/amd64/genassym.cf
@@ -1,8 +1,9 @@
-#      $OpenBSD: genassym.cf,v 1.31 2015/05/18 19:59:27 guenther Exp $
+#      $OpenBSD: genassym.cf,v 1.32 2018/01/22 10:04:46 mpi Exp $
 #      Written by Artur Grabowski art@openbsd.org, Public Domain
 
 include <sys/param.h>
 include <sys/proc.h>
+include <sys/mutex.h>
 include <sys/resourcevar.h>
 include <sys/device.h>
 include <sys/user.h>
@@ -17,7 +18,6 @@ include <machine/intr.h>
 include <machine/pic.h>
 include <machine/tss.h>
 include <machine/i82093var.h>
-include <machine/mutex.h>
 
 export SRUN
 export SONPROC

diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf
index f8b4a85..877df63 100644 (file)
--- a/sys/arch/i386/i386/genassym.cf
+++ b/sys/arch/i386/i386/genassym.cf
@@ -1,4 +1,4 @@
-#      $OpenBSD: genassym.cf,v 1.40 2018/01/04 11:03:48 mpi Exp $
+#      $OpenBSD: genassym.cf,v 1.41 2018/01/22 10:04:46 mpi Exp $
 #
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -32,6 +32,7 @@
 
 include <sys/param.h>
 include <sys/proc.h>
+include <sys/mutex.h>
 include <sys/resourcevar.h>
 include <sys/device.h>
 include <sys/user.h>
@@ -46,7 +47,6 @@ include <uvm/uvm_extern.h>
 include <machine/trap.h>
 include <machine/pmap.h>
 include <machine/vmparam.h>
-include <machine/mutex.h>
 
 if MULTIPROCESSOR
 include <machine/cpu.h>

diff --git a/sys/arch/macppc/macppc/genassym.cf b/sys/arch/macppc/macppc/genassym.cf
index 8d95e9b..369437b 100644 (file)
--- a/sys/arch/macppc/macppc/genassym.cf
+++ b/sys/arch/macppc/macppc/genassym.cf
@@ -1,4 +1,4 @@
-#      $OpenBSD: genassym.cf,v 1.25 2015/08/14 06:14:19 dlg Exp $
+#      $OpenBSD: genassym.cf,v 1.26 2018/01/22 10:04:46 mpi Exp $
 #
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -33,12 +33,12 @@
 include <sys/param.h>
 include <sys/time.h>
 include <sys/proc.h>
+include <sys/mutex.h>
 include <uvm/uvm_extern.h>
 
 include <machine/pcb.h>
 include <machine/pmap.h>
 include <machine/cpu.h>
-include <machine/mutex.h>
 
 export FRAMELEN
 struct trapframe       FRAME_

diff --git a/sys/arch/socppc/socppc/genassym.cf b/sys/arch/socppc/socppc/genassym.cf
index 29319c6..ef444ab 100644 (file)
--- a/sys/arch/socppc/socppc/genassym.cf
+++ b/sys/arch/socppc/socppc/genassym.cf
@@ -1,4 +1,4 @@
-#      $OpenBSD: genassym.cf,v 1.5 2015/08/22 16:54:55 deraadt Exp $
+#      $OpenBSD: genassym.cf,v 1.6 2018/01/22 10:04:46 mpi Exp $
 #
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -33,12 +33,12 @@
 include <sys/param.h>
 include <sys/time.h>
 include <sys/proc.h>
+include <sys/mutex.h>
 include <uvm/uvm_extern.h>
 
 include <machine/pcb.h>
 include <machine/pmap.h>
 include <machine/cpu.h>
-include <machine/mutex.h>
 
 export FRAMELEN
 struct trapframe       FRAME_