diff options
author | Renato Botelho <renato@netgate.com> | 2016-07-19 11:28:42 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-07-19 11:28:42 -0300 |
commit | d672f772561b19a87633a38b63c9b6b9ee457a3e (patch) | |
tree | ddb56ff0f93f58cbbbe2e088659df322eeb91960 /sys/i386/linux/linux_proto.h | |
parent | 0a721af42b1b08f07aac9419590a4906d5b1e8f8 (diff) | |
parent | 9a5d5ad86e4479378293a6598ce3e086d8abf1a8 (diff) | |
download | FreeBSD-src-d672f772561b19a87633a38b63c9b6b9ee457a3e.zip FreeBSD-src-d672f772561b19a87633a38b63c9b6b9ee457a3e.tar.gz |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/i386/linux/linux_proto.h')
-rw-r--r-- | sys/i386/linux/linux_proto.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 87926f4..19b6881 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: head/sys/i386/linux/syscalls.master 300359 2016-05-21 08:01:14Z dchagin + * created from FreeBSD: head/sys/i386/linux/syscalls.master 302515 2016-07-10 08:15:50Z dchagin */ #ifndef _LINUX_SYSPROTO_H_ @@ -435,7 +435,7 @@ struct linux_sysfs_args { char arg2_l_[PADL_(l_ulong)]; l_ulong arg2; char arg2_r_[PADR_(l_ulong)]; }; struct linux_personality_args { - char per_l_[PADL_(l_ulong)]; l_ulong per; char per_r_[PADR_(l_ulong)]; + char per_l_[PADL_(l_uint)]; l_uint per; char per_r_[PADR_(l_uint)]; }; struct linux_setfsuid16_args { char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; @@ -1486,6 +1486,13 @@ int linux_process_vm_writev(struct thread *, struct linux_process_vm_writev_args #endif /* COMPAT_FREEBSD7 */ + +#ifdef COMPAT_FREEBSD10 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD10 */ + #define LINUX_SYS_AUE_linux_exit AUE_EXIT #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC |