Author: pjd
Date: Sun Aug 18 13:38:39 2013
New Revision: 254492
URL: http://svnweb.freebsd.org/changeset/base/254492
Log:
Regenerate after r254491.
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 13:37:54 2013
(r254491)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Sun Aug 18 13:38:39 2013
(r254492)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481
2013-08-18 10:30:41Z pjd
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254491
2013-08-18 13:37:54Z pjd
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -627,6 +627,12 @@ struct freebsd32_wait6_args {
char wrusage_l_[PADL_(struct wrusage32 *)]; struct wrusage32 * wrusage;
char wrusage_r_[PADR_(struct wrusage32 *)];
char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char
info_r_[PADR_(siginfo_t *)];
};
+struct freebsd32_cap_rights_limit_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char rights1_l_[PADL_(uint32_t)]; uint32_t rights1; char
rights1_r_[PADR_(uint32_t)];
+ char rights2_l_[PADL_(uint32_t)]; uint32_t rights2; char
rights2_r_[PADR_(uint32_t)];
+};
#else
struct freebsd32_posix_fallocate_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@@ -652,6 +658,11 @@ struct freebsd32_wait6_args {
char wrusage_l_[PADL_(struct wrusage32 *)]; struct wrusage32 * wrusage;
char wrusage_r_[PADR_(struct wrusage32 *)];
char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char
info_r_[PADR_(siginfo_t *)];
};
+struct freebsd32_cap_rights_limit_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char rights1_l_[PADL_(uint32_t)]; uint32_t rights1; char
rights1_r_[PADR_(uint32_t)];
+ char rights2_l_[PADL_(uint32_t)]; uint32_t rights2; char
rights2_r_[PADR_(uint32_t)];
+};
#endif
struct freebsd32_cap_ioctls_limit_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@@ -784,10 +795,12 @@ int freebsd32_pselect(struct thread *, s
int freebsd32_posix_fallocate(struct thread *, struct
freebsd32_posix_fallocate_args *);
int freebsd32_posix_fadvise(struct thread *, struct
freebsd32_posix_fadvise_args *);
int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *);
+int freebsd32_cap_rights_limit(struct thread *, struct
freebsd32_cap_rights_limit_args *);
#else
int freebsd32_posix_fallocate(struct thread *, struct
freebsd32_posix_fallocate_args *);
int freebsd32_posix_fadvise(struct thread *, struct
freebsd32_posix_fadvise_args *);
int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *);
+int freebsd32_cap_rights_limit(struct thread *, struct
freebsd32_cap_rights_limit_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 *);
@@ -1186,9 +1199,11 @@ 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_rights_limit
AUE_CAP_RIGHTS_LIMIT
#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_rights_limit
AUE_CAP_RIGHTS_LIMIT
#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
Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h Sun Aug 18 13:37:54
2013 (r254491)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Sun Aug 18 13:38:39
2013 (r254492)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481
2013-08-18 10:30:41Z pjd
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254491
2013-08-18 13:37:54Z pjd
*/
#define FREEBSD32_SYS_syscall 0
@@ -438,10 +438,11 @@
#define FREEBSD32_SYS_freebsd32_posix_fallocate 530
#define FREEBSD32_SYS_freebsd32_posix_fadvise 531
#define FREEBSD32_SYS_freebsd32_wait6 532
+#define FREEBSD32_SYS_freebsd32_cap_rights_limit 533
#define FREEBSD32_SYS_freebsd32_posix_fallocate 530
#define FREEBSD32_SYS_freebsd32_posix_fadvise 531
#define FREEBSD32_SYS_freebsd32_wait6 532
-#define FREEBSD32_SYS_cap_rights_limit 533
+#define FREEBSD32_SYS_freebsd32_cap_rights_limit 533
#define FREEBSD32_SYS_freebsd32_cap_ioctls_limit 534
#define FREEBSD32_SYS_freebsd32_cap_ioctls_get 535
#define FREEBSD32_SYS_cap_fcntls_limit 536
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Sun Aug 18 13:37:54
2013 (r254491)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Sun Aug 18 13:38:39
2013 (r254492)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481
2013-08-18 10:30:41Z pjd
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254491
2013-08-18 13:37:54Z pjd
*/
const char *freebsd32_syscallnames[] = {
@@ -557,12 +557,13 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_posix_fallocate", /* 530 =
freebsd32_posix_fallocate */
"freebsd32_posix_fadvise", /* 531 =
freebsd32_posix_fadvise */
"freebsd32_wait6", /* 532 = freebsd32_wait6 */
+ "freebsd32_cap_rights_limit", /* 533 =
freebsd32_cap_rights_limit */
#else
"freebsd32_posix_fallocate", /* 530 =
freebsd32_posix_fallocate */
"freebsd32_posix_fadvise", /* 531 =
freebsd32_posix_fadvise */
"freebsd32_wait6", /* 532 = freebsd32_wait6 */
+ "freebsd32_cap_rights_limit", /* 533 =
freebsd32_cap_rights_limit */
#endif
- "cap_rights_limit", /* 533 = cap_rights_limit */
"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 */
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Sun Aug 18 13:37:54
2013 (r254491)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Sun Aug 18 13:38:39
2013 (r254492)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254481
2013-08-18 10:30:41Z pjd
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 254491
2013-08-18 13:37:54Z pjd
*/
#include "opt_compat.h"
@@ -594,12 +594,13 @@ struct sysent freebsd32_sysent[] = {
{ AS(freebsd32_posix_fallocate_args), (sy_call_t
*)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 =
freebsd32_posix_fallocate */
{ AS(freebsd32_posix_fadvise_args), (sy_call_t
*)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531
= freebsd32_posix_fadvise */
{ AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = freebsd32_wait6 */
+ { AS(freebsd32_cap_rights_limit_args), (sy_call_t
*)freebsd32_cap_rights_limit, AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 533 = freebsd32_cap_rights_limit */
#else
{ AS(freebsd32_posix_fallocate_args), (sy_call_t
*)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 =
freebsd32_posix_fallocate */
{ AS(freebsd32_posix_fadvise_args), (sy_call_t
*)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531
= freebsd32_posix_fadvise */
{ AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = freebsd32_wait6 */
+ { AS(freebsd32_cap_rights_limit_args), (sy_call_t
*)freebsd32_cap_rights_limit, AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 533 = freebsd32_cap_rights_limit */
#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(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 */
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Sun Aug 18 13:37:54
2013 (r254491)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Sun Aug 18 13:38:39
2013 (r254492)
@@ -3159,6 +3159,16 @@ systrace_args(int sysnum, void *params,
*n_args = 8;
break;
}
+ /* freebsd32_cap_rights_limit */
+ case 533: {
+ struct freebsd32_cap_rights_limit_args *p = params;
+ iarg[0] = p->fd; /* int */
+ iarg[1] = p->pad; /* int */
+ uarg[2] = p->rights1; /* uint32_t */
+ uarg[3] = p->rights2; /* uint32_t */
+ *n_args = 4;
+ break;
+ }
#else
/* freebsd32_posix_fallocate */
case 530: {
@@ -3196,15 +3206,16 @@ systrace_args(int sysnum, void *params,
*n_args = 7;
break;
}
-#endif
- /* cap_rights_limit */
+ /* freebsd32_cap_rights_limit */
case 533: {
- struct cap_rights_limit_args *p = params;
+ struct freebsd32_cap_rights_limit_args *p = params;
iarg[0] = p->fd; /* int */
- uarg[1] = p->rights; /* uint64_t */
- *n_args = 2;
+ uarg[1] = p->rights1; /* uint32_t */
+ uarg[2] = p->rights2; /* uint32_t */
+ *n_args = 3;
break;
}
+#endif
/* freebsd32_cap_ioctls_limit */
case 534: {
struct freebsd32_cap_ioctls_limit_args *p = params;
@@ -8572,6 +8583,25 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* freebsd32_cap_rights_limit */
+ case 533:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "uint32_t";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
+ break;
#else
/* freebsd32_posix_fallocate */
case 530:
@@ -8648,20 +8678,23 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#endif
- /* cap_rights_limit */
+ /* freebsd32_cap_rights_limit */
case 533:
switch(ndx) {
case 0:
p = "int";
break;
case 1:
- p = "uint64_t";
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "uint32_t";
break;
default:
break;
};
break;
+#endif
/* freebsd32_cap_ioctls_limit */
case 534:
switch(ndx) {
@@ -10622,6 +10655,11 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* freebsd32_cap_rights_limit */
+ case 533:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
#else
/* freebsd32_posix_fallocate */
case 530:
@@ -10638,12 +10676,12 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#endif
- /* cap_rights_limit */
+ /* freebsd32_cap_rights_limit */
case 533:
if (ndx == 0 || ndx == 1)
p = "int";
break;
+#endif
/* freebsd32_cap_ioctls_limit */
case 534:
if (ndx == 0 || ndx == 1)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
