Fixup some problems in my previous commit (COMPAT_43).

Pointyhat to:	netchild

13 files changed, 4 insertions, 25 deletions

diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index 60b9198..67f54f3 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -11,8 +11,7 @@
 ;		there is no audit event for the call at this time. For the
 ;		case where the event exists, but we don't want auditing, the
 ;		event should be #defined to AUE_NULL in audit_kevents.h.
-;	type	one of STD, OBSOL, UNIMPL, CPT_NOA, LIBCOMPAT,
-;		NODEF, NOARGS, NOPROTO
+;	type	one of STD, OBSOL, UNIMPL, NODEF, NOARGS, NOPROTO
 ;	name	psuedo-prototype of syscall routine
 ;		If one of the following alts is different, then all appear:
 ;	altname	name of system call if different
@@ -22,8 +21,6 @@
 
 ; types:
 ;	STD	always included
-;	CPT_NOA	combines COMPAT with NOARGS
-;	LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h
 ;	NOARGS	same as STD except do not create structure in sys/sysproto.h
 ;	NODEF	??
 ;	NOPROTO	same as STD except do not create structure or function in
@@ -31,7 +28,6 @@
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 
-#include "opt_compat.h"
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index b0d054d..2c0216e 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -29,7 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 90f40cf..7ffa0fa 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index a8e494d..db7c1d2 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#include "opt_compat.h"
-
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 0989847..4b4e44f 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sem.h>
 #include <sys/shm.h>
 
-#include "opt_compat.h"
-
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 0721d52..c7398c1 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 
-#include "opt_compat.h"
-
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
 #else
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index a63c2a3..b59730f 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -30,7 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 1fc5bb4..ac4d0c5 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/syscallsubr.h>
 #include <sys/sysproto.h>
 
-#include "opt_compat.h"
-
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index e7e98f8..e8d2802 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 /* XXX we use functions that might not exist. */
-#include "opt_compat.h"
 #include "opt_inet6.h"
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index f4f1bbd..3364d60 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -29,7 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index 9111dbe..c73ba5e 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index ba01aef..0d5ef6c 100644
--- a/sys/compat/linux/linux_uid16.c
+++ b/sys/compat/linux/linux_uid16.c
@@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 6e16865..aec641f 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -141,7 +141,7 @@
 72	AUE_NULL	MSTD	{ int linux_sigsuspend(l_int hist0, \
 				    l_int hist1, l_osigset_t mask); }
 73	AUE_NULL	MSTD	{ int linux_sigpending(l_osigset_t *mask); }
-74	AUE_SYSCTL	MNOPROTO { int linux_sethostname(char *hostname, \
+74	AUE_SYSCTL	MSTD	{ int linux_sethostname(char *hostname, \
 				    u_int len); }
 75	AUE_SETRLIMIT	MSTD	{ int linux_setrlimit(l_uint resource, \
 				    struct l_rlimit *rlim); }
@@ -162,7 +162,7 @@
 82	AUE_SELECT	MSTD	{ int linux_old_select( \
 				    struct l_old_select_argv *ptr); }
 83	AUE_SYMLINK	MSTD	{ int linux_symlink(char *path, char *to); }
-84	AUE_STAT	MNOPROTO	{ int linux_stat(char *path, struct ostat *up); }
+84	AUE_STAT	MSTD	{ int linux_lstat(char *path, struct ostat *up); }
 85	AUE_READLINK	MSTD	{ int linux_readlink(char *name, char *buf, \
 				    l_int count); }
 86	AUE_USELIB	STD	{ int linux_uselib(char *library); }
@@ -175,7 +175,7 @@
 91	AUE_MUNMAP	MNOPROTO	{ int munmap(caddr_t addr, int len); }
 92	AUE_TRUNCATE	MSTD	{ int linux_truncate(char *path, \
 				    l_ulong length); }
-93	AUE_FTRUNCATE	MNOPROTO	{ int linux_ftruncate(int fd, long length); }
+93	AUE_FTRUNCATE	MSTD	{ int linux_ftruncate(int fd, long length); }
 94	AUE_FCHMOD	MNOPROTO	{ int fchmod(int fd, int mode); }
 95	AUE_FCHOWN	MNOPROTO	{ int fchown(int fd, int uid, int gid); }
 96	AUE_GETPRIORITY	MSTD	{ int linux_getpriority(int which, int who); }