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

2001-10-10 17:48:44 +00:00 · 2001-10-10 17:48:44 +00:00 · 6eabd84580
commit 6eabd84580
parent 260a117141
36 changed files with 0 additions and 57 deletions
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/contrib/ipfilter/ipsend/iptests.c
@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #define _KERNEL
 #define KERNEL
 #if !defined(solaris) && !defined(linux) && !defined(__sgi)
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/contrib/ipfilter/ipsend/sock.c
@ -13,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/stat.h>
 #ifndef	ultrix
 #include <fcntl.h>
--- a/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c
+++ b/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c
@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "defs.h"

 #include <sys/types.h>
-#include <sys/lock.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include <machine/frame.h>
--- a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <paths.h>
 #include <sys/sysctl.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/user.h>
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <paths.h>
 #include <sys/sysctl.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/user.h>
--- a/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
+++ b/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #include <stdio.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <dirent.h>
 #include <sys/user.h>
 #include <signal.h>
--- 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>

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

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

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

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

--- 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>
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@ -46,7 +46,6 @@ static const char rcsid[] =
 #endif /* not lint */

 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/user.h>
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.c
@ -57,7 +57,6 @@ static const char rcsid[] =
 * contract BG 91-66 and contributed to Berkeley.
 */
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@ -57,7 +57,6 @@ static const char rcsid[] =
 * contract BG 91-66 and contributed to Berkeley.
 */
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@ -29,7 +29,6 @@

 #include <sys/cdefs.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/user.h>
 #include <sys/sysctl.h>
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@ -41,7 +41,6 @@ static const char rcsid[] =

 #include <sys/param.h>
 #include <sys/file.h>
-#include <sys/lock.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/time.h>
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@ -43,7 +43,6 @@ static char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";

 #include <sys/param.h>
 #include <sys/dkstat.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/user.h>
 #include <sys/sysctl.h>
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/param.h>
-#include <sys/lock.h>

 #include "os.h"
 #include <stdio.h>
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@ -40,7 +40,6 @@ static const char rcsid[] =
 #endif /* not lint */

 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/user.h>

--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@ -52,7 +52,6 @@ static const char rcsid[] =
 *
 */
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>