From d4a3f5ddb67c4b2463330f2aa998a503383caf88 Mon Sep 17 00:00:00 2001 From: Alexander Leidinger Date: Sat, 18 Mar 2006 20:47:36 +0000 Subject: [PATCH] Fixup some problems in my previous commit (COMPAT_43). Pointyhat to: netchild --- sys/alpha/linux/syscalls.master | 6 +----- sys/compat/linux/linux_file.c | 1 - sys/compat/linux/linux_getcwd.c | 1 - sys/compat/linux/linux_ioctl.c | 2 -- sys/compat/linux/linux_ipc.c | 2 -- sys/compat/linux/linux_mib.c | 2 -- sys/compat/linux/linux_misc.c | 1 - sys/compat/linux/linux_signal.c | 2 -- sys/compat/linux/linux_socket.c | 1 - sys/compat/linux/linux_stats.c | 1 - sys/compat/linux/linux_sysctl.c | 2 -- sys/compat/linux/linux_uid16.c | 2 -- sys/i386/linux/syscalls.master | 6 +++--- 13 files changed, 4 insertions(+), 25 deletions(-) diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master index 60b9198ba6f8..67f54f358618 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 #include #include diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index b0d054d12930..2c0216e54bfa 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_mac.h" #include diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 90f40cf70ec3..7ffa0fa71ed7 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_mac.h" #include diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index a8e494de1116..db7c1d2ac5b5 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 0989847e3c84..4b4e44fca9bd 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index 0721d529bea0..c7398c17e1e5 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #else diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index a63c2a372c35..b59730ff3011 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -30,7 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_mac.h" #include diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 1fc5bb484032..ac4d0c5942d3 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index e7e98f830cd3..e8d2802e64b5 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 diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index f4f1bbd685e2..3364d604ffa2 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_mac.h" #include diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 9111dbec7805..c73ba5e3a8e3 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index ba01aef427ea..0d5ef6c0f8e4 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 6e168656cf88..aec641f01087 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); }