diff options
author | netchild <netchild@FreeBSD.org> | 2006-03-18 18:24:38 +0000 |
---|---|---|
committer | netchild <netchild@FreeBSD.org> | 2006-03-18 18:24:38 +0000 |
commit | 8fd66644120b8702f4e437382895c11d47db3acd (patch) | |
tree | a883716329bf9404082357808b2a50201c92274a /sys/i386/linux | |
parent | c1829f604cdf8a3f393bfa6cb85fe9a6d4908919 (diff) | |
download | FreeBSD-src-8fd66644120b8702f4e437382895c11d47db3acd.zip FreeBSD-src-8fd66644120b8702f4e437382895c11d47db3acd.tar.gz |
regen after COMPAT_43 removal
Diffstat (limited to 'sys/i386/linux')
-rw-r--r-- | sys/i386/linux/linux.h | 18 | ||||
-rw-r--r-- | sys/i386/linux/linux_dummy.c | 1 | ||||
-rw-r--r-- | sys/i386/linux/linux_proto.h | 6 | ||||
-rw-r--r-- | sys/i386/linux/linux_syscall.h | 8 | ||||
-rw-r--r-- | sys/i386/linux/linux_sysent.c | 9 | ||||
-rw-r--r-- | sys/i386/linux/linux_sysvec.c | 7 |
6 files changed, 29 insertions, 20 deletions
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 6ca77b3..08a76f3 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -170,6 +170,24 @@ struct l_newstat { l_ulong __unused5; }; +struct l_stat { + l_ushort st_dev; + l_ulong st_ino; + l_ushort st_mode; + l_ushort st_nlink; + l_ushort st_uid; + l_ushort st_gid; + l_ushort st_rdev; + l_long st_size; + struct l_timespec st_atimespec; + struct l_timespec st_mtimespec; + struct l_timespec st_ctimespec; + l_long st_blksize; + l_long st_blocks; + l_ulong st_flags; + l_ulong st_gen; +}; + struct l_stat64 { l_ushort st_dev; u_char __pad0[10]; diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c index 0ff2460..e97c5fa 100644 --- a/sys/i386/linux/linux_dummy.c +++ b/sys/i386/linux/linux_dummy.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include <i386/linux/linux_proto.h> #include <compat/linux/linux_util.h> -DUMMY(stat); DUMMY(stime); DUMMY(fstat); DUMMY(olduname); diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index c06d41e..0bbb95d 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.63 2006/02/06 01:40:30 rwatson Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.64 2006/03/18 18:20:16 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -84,7 +84,7 @@ struct linux_lchown16_args { }; struct linux_stat_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char up_l_[PADL_(struct ostat *)]; struct ostat * up; char up_r_[PADR_(struct ostat *)]; + char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)]; }; struct linux_lseek_args { char fdes_l_[PADL_(l_uint)]; l_uint fdes; char fdes_r_[PADR_(l_uint)]; @@ -124,7 +124,7 @@ struct linux_alarm_args { }; struct linux_fstat_args { char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; - char up_l_[PADL_(struct ostat *)]; struct ostat * up; char up_r_[PADR_(struct ostat *)]; + char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)]; }; struct linux_pause_args { register_t dummy; diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h index 8ecddd0..bda5a11 100644 --- a/sys/i386/linux/linux_syscall.h +++ b/sys/i386/linux/linux_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.63 2006/02/06 01:40:30 rwatson Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.64 2006/03/18 18:20:16 netchild Exp */ #define LINUX_SYS_exit 1 @@ -71,7 +71,7 @@ #define LINUX_SYS_linux_setregid16 71 #define LINUX_SYS_linux_sigsuspend 72 #define LINUX_SYS_linux_sigpending 73 -#define LINUX_SYS_osethostname 74 +#define LINUX_SYS_linux_sethostname 74 #define LINUX_SYS_linux_setrlimit 75 #define LINUX_SYS_linux_old_getrlimit 76 #define LINUX_SYS_getrusage 77 @@ -81,7 +81,7 @@ #define LINUX_SYS_linux_setgroups16 81 #define LINUX_SYS_linux_old_select 82 #define LINUX_SYS_linux_symlink 83 -#define LINUX_SYS_ostat 84 +#define LINUX_SYS_linux_stat 84 #define LINUX_SYS_linux_readlink 85 #define LINUX_SYS_linux_uselib 86 #define LINUX_SYS_swapon 87 @@ -90,7 +90,7 @@ #define LINUX_SYS_linux_mmap 90 #define LINUX_SYS_munmap 91 #define LINUX_SYS_linux_truncate 92 -#define LINUX_SYS_oftruncate 93 +#define LINUX_SYS_linux_ftruncate 93 #define LINUX_SYS_fchmod 94 #define LINUX_SYS_fchown 95 #define LINUX_SYS_linux_getpriority 96 diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 741b8ae..df1cee6 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -3,11 +3,10 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.63 2006/02/06 01:40:30 rwatson Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.64 2006/03/18 18:20:16 netchild Exp */ #include <bsm/audit_kevents.h> -#include "opt_compat.h" #include <sys/param.h> #include <sys/sysent.h> #include <sys/sysproto.h> @@ -94,7 +93,7 @@ struct sysent linux_sysent[] = { { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 74 = osethostname */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 77 = getrusage */ @@ -104,7 +103,7 @@ struct sysent linux_sysent[] = { { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(ostat_args), (sy_call_t *)ostat, AUE_STAT }, /* 84 = ostat */ + { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 84 = linux_stat */ { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 86 = linux_uselib */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ @@ -113,7 +112,7 @@ struct sysent linux_sysent[] = { { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 93 = oftruncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 1335f9a..0333acb 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -29,13 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -/* XXX we use functions that might not exist. */ -#include "opt_compat.h" - -#ifndef COMPAT_43 -#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!" -#endif - #include <sys/param.h> #include <sys/systm.h> #include <sys/exec.h> |