From cfc3386f7b945d9b553f39e572c8b0ddff980d6d Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 18 Sep 2010 20:32:38 +0200
Subject: [PATCH] kernel: Remove #include <sys/mutex.h> if <sys/mutex2.h> is
 included too.

---
 sys/dev/disk/iscsi/initiator/isc_cam.c    | 1 -
 sys/dev/disk/iscsi/initiator/isc_sm.c     | 1 -
 sys/dev/disk/iscsi/initiator/isc_soc.c    | 1 -
 sys/dev/disk/iscsi/initiator/isc_subr.c   | 1 -
 sys/dev/disk/iscsi/initiator/iscsi.c      | 1 -
 sys/dev/disk/iscsi/initiator/iscsi_subr.c | 1 -
 sys/kern/kern_mutex.c                     | 1 -
 sys/libprop/prop_object_impl.h            | 1 -
 sys/vfs/nfs/nfs_iod.c                     | 1 -
 sys/vfs/nfs/nfs_socket.c                  | 1 -
 sys/vfs/nfs/nfs_syscalls.c                | 1 -
 11 files changed, 11 deletions(-)

diff --git a/sys/dev/disk/iscsi/initiator/isc_cam.c b/sys/dev/disk/iscsi/initiator/isc_cam.c
index a75aa6aca1..e6f6cb30c9 100644
--- a/sys/dev/disk/iscsi/initiator/isc_cam.c
+++ b/sys/dev/disk/iscsi/initiator/isc_cam.c
@@ -38,7 +38,6 @@
 #include <sys/sysctl.h>
 #include <sys/eventhandler.h>
 #include <sys/globaldata.h>
-#include <sys/mutex.h>
 #include <sys/mutex2.h>
 
 #include <bus/cam/cam.h>
diff --git a/sys/dev/disk/iscsi/initiator/isc_sm.c b/sys/dev/disk/iscsi/initiator/isc_sm.c
index a819f66fa9..3e0238f9a4 100644
--- a/sys/dev/disk/iscsi/initiator/isc_sm.c
+++ b/sys/dev/disk/iscsi/initiator/isc_sm.c
@@ -53,7 +53,6 @@
 #include <sys/mbuf.h>
 #include <sys/bus.h>
 #include <sys/eventhandler.h>
-#include <sys/mutex.h>
 
 #include <sys/thread2.h>
 #include <sys/mutex2.h>
diff --git a/sys/dev/disk/iscsi/initiator/isc_soc.c b/sys/dev/disk/iscsi/initiator/isc_soc.c
index 9d5b20670b..72fe8bd176 100644
--- a/sys/dev/disk/iscsi/initiator/isc_soc.c
+++ b/sys/dev/disk/iscsi/initiator/isc_soc.c
@@ -54,7 +54,6 @@
 #include <sys/user.h>
 #include <signal.h>
 #include <sys/eventhandler.h>
-#include <sys/mutex.h>
 #include <sys/socketops.h>
 
 #include <sys/thread2.h>
diff --git a/sys/dev/disk/iscsi/initiator/isc_subr.c b/sys/dev/disk/iscsi/initiator/isc_subr.c
index e867db2e5e..f075c52487 100644
--- a/sys/dev/disk/iscsi/initiator/isc_subr.c
+++ b/sys/dev/disk/iscsi/initiator/isc_subr.c
@@ -53,7 +53,6 @@
 #include <sys/mbuf.h>
 #include <sys/libkern.h>
 #include <sys/eventhandler.h>
-#include <sys/mutex.h>
 #include <sys/mutex2.h>
 
 #include <bus/cam/cam.h>
diff --git a/sys/dev/disk/iscsi/initiator/iscsi.c b/sys/dev/disk/iscsi/initiator/iscsi.c
index 387b4e102a..7dfe3c9f86 100644
--- a/sys/dev/disk/iscsi/initiator/iscsi.c
+++ b/sys/dev/disk/iscsi/initiator/iscsi.c
@@ -54,7 +54,6 @@
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/eventhandler.h>
-#include <sys/mutex.h>
 #include <sys/mutex2.h>
 #include <sys/devfs.h>
 #include <sys/udev.h>
diff --git a/sys/dev/disk/iscsi/initiator/iscsi_subr.c b/sys/dev/disk/iscsi/initiator/iscsi_subr.c
index f302e98061..3df1cdf254 100644
--- a/sys/dev/disk/iscsi/initiator/iscsi_subr.c
+++ b/sys/dev/disk/iscsi/initiator/iscsi_subr.c
@@ -42,7 +42,6 @@
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/globaldata.h>
-#include <sys/mutex.h>
 
 #include <bus/cam/cam.h>
 #include <bus/cam/cam_ccb.h>
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 810014a29d..58259add33 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -49,7 +49,6 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/thread.h>
-#include <sys/mutex.h>
 
 #include <machine/cpufunc.h>
 
diff --git a/sys/libprop/prop_object_impl.h b/sys/libprop/prop_object_impl.h
index 2f5c4c929b..ec37bdfa45 100644
--- a/sys/libprop/prop_object_impl.h
+++ b/sys/libprop/prop_object_impl.h
@@ -254,7 +254,6 @@ struct _prop_object_iterator {
 #include <sys/objcache.h>
 #include <sys/systm.h>
 #include <sys/globaldata.h>
-#include <sys/mutex.h>
 #include <sys/mutex2.h>
 #include <sys/lock.h>
 
diff --git a/sys/vfs/nfs/nfs_iod.c b/sys/vfs/nfs/nfs_iod.c
index 8b8c8538c8..6d28ab4c9f 100644
--- a/sys/vfs/nfs/nfs_iod.c
+++ b/sys/vfs/nfs/nfs_iod.c
@@ -53,7 +53,6 @@
 #include <sys/tprintf.h>
 #include <sys/sysctl.h>
 #include <sys/signalvar.h>
-#include <sys/mutex.h>
 
 #include <sys/signal2.h>
 #include <sys/thread2.h>
diff --git a/sys/vfs/nfs/nfs_socket.c b/sys/vfs/nfs/nfs_socket.c
index 628c1b5b7a..d05a8830b3 100644
--- a/sys/vfs/nfs/nfs_socket.c
+++ b/sys/vfs/nfs/nfs_socket.c
@@ -61,7 +61,6 @@
 #include <sys/tprintf.h>
 #include <sys/sysctl.h>
 #include <sys/signalvar.h>
-#include <sys/mutex.h>
 
 #include <sys/signal2.h>
 #include <sys/mutex2.h>
diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c
index 3559573d21..53091fe28c 100644
--- a/sys/vfs/nfs/nfs_syscalls.c
+++ b/sys/vfs/nfs/nfs_syscalls.c
@@ -58,7 +58,6 @@
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/nlookup.h>
-#include <sys/mutex.h>
 #include <vm/vm_zone.h>
 
 #include <sys/mutex2.h>
-- 
2.41.0