Date: Sun, 18 Aug 2013 10:31:30 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254482 - head/sys/compat/freebsd32 Message-ID: <201308181031.r7IAVUsO085736@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pjd Date: Sun Aug 18 10:31:30 2013 New Revision: 254482 URL: http://svnweb.freebsd.org/changeset/base/254482 Log: Regenerate after r254481. Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/freebsd32/freebsd32_systrace_args.c Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Sun Aug 18 10:30:41 2013 (r254481) +++ head/sys/compat/freebsd32/freebsd32_proto.h Sun Aug 18 10:31:30 2013 (r254482) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254447 2013-08-17 14:17:13Z pjd + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481 2013-08-18 10:30:41Z pjd */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -653,6 +653,16 @@ struct freebsd32_wait6_args { char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; }; #endif +struct freebsd32_cap_ioctls_limit_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char cmds_l_[PADL_(const uint32_t *)]; const uint32_t * cmds; char cmds_r_[PADR_(const uint32_t *)]; + char ncmds_l_[PADL_(size_t)]; size_t ncmds; char ncmds_r_[PADR_(size_t)]; +}; +struct freebsd32_cap_ioctls_get_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char cmds_l_[PADL_(uint32_t *)]; uint32_t * cmds; char cmds_r_[PADR_(uint32_t *)]; + char maxcmds_l_[PADL_(size_t)]; size_t maxcmds; char maxcmds_r_[PADR_(size_t)]; +}; struct freebsd32_aio_mlock_args { char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; }; @@ -779,6 +789,8 @@ int freebsd32_posix_fallocate(struct thr int freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *); int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *); #endif +int freebsd32_cap_ioctls_limit(struct thread *, struct freebsd32_cap_ioctls_limit_args *); +int freebsd32_cap_ioctls_get(struct thread *, struct freebsd32_cap_ioctls_get_args *); int freebsd32_aio_mlock(struct thread *, struct freebsd32_aio_mlock_args *); #ifdef COMPAT_43 @@ -1177,6 +1189,8 @@ int freebsd7_freebsd32_shmctl(struct thr #define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_posix_fadvise AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_wait6 AUE_WAIT6 +#define FREEBSD32_SYS_AUE_freebsd32_cap_ioctls_limit AUE_CAP_IOCTLS_LIMIT +#define FREEBSD32_SYS_AUE_freebsd32_cap_ioctls_get AUE_CAP_IOCTLS_GET #define FREEBSD32_SYS_AUE_freebsd32_aio_mlock AUE_NULL #undef PAD_ Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Sun Aug 18 10:30:41 2013 (r254481) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Sun Aug 18 10:31:30 2013 (r254482) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254447 2013-08-17 14:17:13Z pjd + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481 2013-08-18 10:30:41Z pjd */ #define FREEBSD32_SYS_syscall 0 @@ -442,8 +442,8 @@ #define FREEBSD32_SYS_freebsd32_posix_fadvise 531 #define FREEBSD32_SYS_freebsd32_wait6 532 #define FREEBSD32_SYS_cap_rights_limit 533 -#define FREEBSD32_SYS_cap_ioctls_limit 534 -#define FREEBSD32_SYS_cap_ioctls_get 535 +#define FREEBSD32_SYS_freebsd32_cap_ioctls_limit 534 +#define FREEBSD32_SYS_freebsd32_cap_ioctls_get 535 #define FREEBSD32_SYS_cap_fcntls_limit 536 #define FREEBSD32_SYS_cap_fcntls_get 537 #define FREEBSD32_SYS_bindat 538 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Sun Aug 18 10:30:41 2013 (r254481) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Sun Aug 18 10:31:30 2013 (r254482) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254447 2013-08-17 14:17:13Z pjd + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481 2013-08-18 10:30:41Z pjd */ const char *freebsd32_syscallnames[] = { @@ -563,8 +563,8 @@ const char *freebsd32_syscallnames[] = { "freebsd32_wait6", /* 532 = freebsd32_wait6 */ #endif "cap_rights_limit", /* 533 = cap_rights_limit */ - "cap_ioctls_limit", /* 534 = cap_ioctls_limit */ - "cap_ioctls_get", /* 535 = cap_ioctls_get */ + "freebsd32_cap_ioctls_limit", /* 534 = freebsd32_cap_ioctls_limit */ + "freebsd32_cap_ioctls_get", /* 535 = freebsd32_cap_ioctls_get */ "cap_fcntls_limit", /* 536 = cap_fcntls_limit */ "cap_fcntls_get", /* 537 = cap_fcntls_get */ "bindat", /* 538 = bindat */ Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Sun Aug 18 10:30:41 2013 (r254481) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Sun Aug 18 10:31:30 2013 (r254482) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254447 2013-08-17 14:17:13Z pjd + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481 2013-08-18 10:30:41Z pjd */ #include "opt_compat.h" @@ -600,8 +600,8 @@ struct sysent freebsd32_sysent[] = { { AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = freebsd32_wait6 */ #endif { AS(cap_rights_limit_args), (sy_call_t *)sys_cap_rights_limit, AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 533 = cap_rights_limit */ - { AS(cap_ioctls_limit_args), (sy_call_t *)sys_cap_ioctls_limit, AUE_CAP_IOCTLS_LIMIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 534 = cap_ioctls_limit */ - { AS(cap_ioctls_get_args), (sy_call_t *)sys_cap_ioctls_get, AUE_CAP_IOCTLS_GET, NULL, 0, 0, 0, SY_THR_STATIC }, /* 535 = cap_ioctls_get */ + { AS(freebsd32_cap_ioctls_limit_args), (sy_call_t *)freebsd32_cap_ioctls_limit, AUE_CAP_IOCTLS_LIMIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 534 = freebsd32_cap_ioctls_limit */ + { AS(freebsd32_cap_ioctls_get_args), (sy_call_t *)freebsd32_cap_ioctls_get, AUE_CAP_IOCTLS_GET, NULL, 0, 0, 0, SY_THR_STATIC }, /* 535 = freebsd32_cap_ioctls_get */ { AS(cap_fcntls_limit_args), (sy_call_t *)sys_cap_fcntls_limit, AUE_CAP_FCNTLS_LIMIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 536 = cap_fcntls_limit */ { AS(cap_fcntls_get_args), (sy_call_t *)sys_cap_fcntls_get, AUE_CAP_FCNTLS_GET, NULL, 0, 0, 0, SY_THR_STATIC }, /* 537 = cap_fcntls_get */ { AS(bindat_args), (sy_call_t *)sys_bindat, AUE_BINDAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 538 = bindat */ Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Sun Aug 18 10:30:41 2013 (r254481) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Sun Aug 18 10:31:30 2013 (r254482) @@ -3205,20 +3205,20 @@ systrace_args(int sysnum, void *params, *n_args = 2; break; } - /* cap_ioctls_limit */ + /* freebsd32_cap_ioctls_limit */ case 534: { - struct cap_ioctls_limit_args *p = params; + struct freebsd32_cap_ioctls_limit_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->cmds; /* const u_long * */ + uarg[1] = (intptr_t) p->cmds; /* const uint32_t * */ uarg[2] = p->ncmds; /* size_t */ *n_args = 3; break; } - /* cap_ioctls_get */ + /* freebsd32_cap_ioctls_get */ case 535: { - struct cap_ioctls_get_args *p = params; + struct freebsd32_cap_ioctls_get_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->cmds; /* u_long * */ + uarg[1] = (intptr_t) p->cmds; /* uint32_t * */ uarg[2] = p->maxcmds; /* size_t */ *n_args = 3; break; @@ -8662,14 +8662,14 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; - /* cap_ioctls_limit */ + /* freebsd32_cap_ioctls_limit */ case 534: switch(ndx) { case 0: p = "int"; break; case 1: - p = "const u_long *"; + p = "const uint32_t *"; break; case 2: p = "size_t"; @@ -8678,14 +8678,14 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; - /* cap_ioctls_get */ + /* freebsd32_cap_ioctls_get */ case 535: switch(ndx) { case 0: p = "int"; break; case 1: - p = "u_long *"; + p = "uint32_t *"; break; case 2: p = "size_t"; @@ -10644,12 +10644,12 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; - /* cap_ioctls_limit */ + /* freebsd32_cap_ioctls_limit */ case 534: if (ndx == 0 || ndx == 1) p = "int"; break; - /* cap_ioctls_get */ + /* freebsd32_cap_ioctls_get */ case 535: if (ndx == 0 || ndx == 1) p = "ssize_t";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308181031.r7IAVUsO085736>