diff options
author | ru <ru@FreeBSD.org> | 2006-03-19 11:10:33 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-03-19 11:10:33 +0000 |
commit | 106242f7bb92f6bf4608b260788264aa932b5fd1 (patch) | |
tree | c8a8de78b74817ce20c1f2ccb55b32a8cd9d7e6c | |
parent | fadb519311e09fd87a52f760f8bf3911198177e9 (diff) | |
download | FreeBSD-src-106242f7bb92f6bf4608b260788264aa932b5fd1.zip FreeBSD-src-106242f7bb92f6bf4608b260788264aa932b5fd1.tar.gz |
Unbreak COMPAT_LINUX32 option support on amd64.
Broken by: netchild
-rw-r--r-- | sys/amd64/linux32/linux32_sysvec.c | 1 | ||||
-rw-r--r-- | sys/amd64/linux32/syscalls.master | 1 | ||||
-rw-r--r-- | sys/compat/linux/linux_file.c | 1 | ||||
-rw-r--r-- | sys/compat/linux/linux_getcwd.c | 1 | ||||
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_ipc.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_mib.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_misc.c | 1 | ||||
-rw-r--r-- | sys/compat/linux/linux_signal.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_socket.c | 1 | ||||
-rw-r--r-- | sys/compat/linux/linux_stats.c | 1 | ||||
-rw-r--r-- | sys/compat/linux/linux_sysctl.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_uid16.c | 2 |
13 files changed, 19 insertions, 0 deletions
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index acfd055..6ed02e2 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -32,6 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_compat.h" #ifndef COMPAT_IA32 #error "Unable to compile Linux-emulator due to missing COMPAT_IA32 option!" diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 8ccb359..529c530 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -24,6 +24,7 @@ ; 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 2c0216e..b0d054d 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -29,6 +29,7 @@ #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 7ffa0fa..90f40cf 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -39,6 +39,7 @@ #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 db7c1d2..a8e494d 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -57,6 +57,8 @@ __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 4b4e44f..0989847 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -39,6 +39,8 @@ __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 c7398c1..0721d52 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -39,6 +39,8 @@ __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 b59730f..a63c2a3 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -30,6 +30,7 @@ #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 ac4d0c5..1fc5bb4 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -38,6 +38,8 @@ __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 e8d2802..e7e98f8 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -30,6 +30,7 @@ __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 3364d60..f4f1bbd 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -29,6 +29,7 @@ #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 c73ba5e..9111dbe 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -29,6 +29,8 @@ #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 0d5ef6c..ba01aef 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_compat.h" + #include <sys/param.h> #include <sys/lock.h> #include <sys/malloc.h> |