Compensate for "Compensate for header dethreading" by backing it out.

21 files changed, 0 insertions, 42 deletions

diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 7e263fb..83db5ec 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -42,8 +42,6 @@ static char rcsid[] =
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index a2ee237..924790d 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <stdlib.h>
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index f5e3283..a8f6913 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -40,8 +40,6 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <errno.h>
diff --git a/lib/libc/gen/getvfsent.c b/lib/libc/gen/getvfsent.c
index d86dfa0..2b8998c 100644
--- a/lib/libc/gen/getvfsent.c
+++ b/lib/libc/gen/getvfsent.c
@@ -7,8 +7,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index 8af17a6..d1762f5 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)opendir.c	8.8 (Berkeley) 5/1/95";
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc_r/uthread/uthread_fstat.c b/lib/libc_r/uthread/uthread_fstat.c
index bc2a00b..0aa49d1 100644
--- a/lib/libc_r/uthread/uthread_fstat.c
+++ b/lib/libc_r/uthread/uthread_fstat.c
@@ -35,8 +35,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_fstatfs.c b/lib/libc_r/uthread/uthread_fstatfs.c
index 68d4308..80a8fd5 100644
--- a/lib/libc_r/uthread/uthread_fstatfs.c
+++ b/lib/libc_r/uthread/uthread_fstatfs.c
@@ -35,8 +35,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c
index 9f10f74..7bf09e5 100644
--- a/lib/libc_r/uthread/uthread_init.c
+++ b/lib/libc_r/uthread/uthread_init.c
@@ -37,8 +37,6 @@
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <machine/reg.h>
 
diff --git a/lib/libc_r/uthread/uthread_jmp.c b/lib/libc_r/uthread/uthread_jmp.c
index 772d53d..df9759f 100644
--- a/lib/libc_r/uthread/uthread_jmp.c
+++ b/lib/libc_r/uthread/uthread_jmp.c
@@ -34,8 +34,6 @@
 #include <unistd.h>
 #include <setjmp.h>
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <machine/reg.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_init.c b/lib/libkse/thread/thr_init.c
index 9f10f74..7bf09e5 100644
--- a/lib/libkse/thread/thr_init.c
+++ b/lib/libkse/thread/thr_init.c
@@ -37,8 +37,6 @@
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <machine/reg.h>
 
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index a00c36f..8ce148e 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index eac32c0..c9550c3 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index 83882e07..f0c1b93 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -48,8 +48,6 @@ static char sccsid[] = "@(#)kvm_file.c	8.1 (Berkeley) 6/4/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #define _KERNEL
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index 6ca3869..ef68fc7 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)kvm_getloadavg.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index c2cc5a0..f3f72dd 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -11,8 +11,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/conf.h>
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index eac32c0..c9550c3 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 48cf414..990f856 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
diff --git a/lib/libncp/ipx.c b/lib/libncp/ipx.c
index 6ca1dfd..b55b58b 100644
--- a/lib/libncp/ipx.c
+++ b/lib/libncp/ipx.c
@@ -34,8 +34,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
diff --git a/lib/libncp/ncpl_conn.c b/lib/libncp/ncpl_conn.c
index c60d628..0ae7a1c 100644
--- a/lib/libncp/ncpl_conn.c
+++ b/lib/libncp/ncpl_conn.c
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
  * 
  */
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
diff --git a/lib/libpthread/thread/thr_init.c b/lib/libpthread/thread/thr_init.c
index 9f10f74..7bf09e5 100644
--- a/lib/libpthread/thread/thr_init.c
+++ b/lib/libpthread/thread/thr_init.c
@@ -37,8 +37,6 @@
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <machine/reg.h>
 
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index 4d852d4..baae9a9 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -35,8 +35,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/mount.h>