Author: kib
Date: Tue Jul 31 17:16:06 2018
New Revision: 336981
URL: https://svnweb.freebsd.org/changeset/base/336981
Log:
Regenerate after r336980.
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 Tue Jul 31 17:15:31 2018
(r336980)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Tue Jul 31 17:16:06 2018
(r336981)
@@ -279,6 +279,10 @@ struct freebsd32_aio_suspend_args {
struct freebsd32_aio_error_args {
char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
};
+struct freebsd32_sched_rr_get_interval_args {
+ char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
+ char interval_l_[PADL_(struct timespec32 *)]; struct timespec32 *
interval; char interval_r_[PADR_(struct timespec32 *)];
+};
struct freebsd32_jail_args {
char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char
jail_r_[PADR_(struct jail32 *)];
};
@@ -756,6 +760,7 @@ int freebsd32_kldstat(struct thread *, struct freebsd3
int freebsd32_aio_return(struct thread *, struct freebsd32_aio_return_args
*);
int freebsd32_aio_suspend(struct thread *, struct
freebsd32_aio_suspend_args *);
int freebsd32_aio_error(struct thread *, struct freebsd32_aio_error_args *);
+int freebsd32_sched_rr_get_interval(struct thread *, struct
freebsd32_sched_rr_get_interval_args *);
int freebsd32_jail(struct thread *, struct freebsd32_jail_args *);
int freebsd32_sigtimedwait(struct thread *, struct
freebsd32_sigtimedwait_args *);
int freebsd32_sigwaitinfo(struct thread *, struct
freebsd32_sigwaitinfo_args *);
@@ -1310,6 +1315,7 @@ int freebsd11_freebsd32_mknodat(struct thread *,
struc
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_aio_read AUE_AIO_READ
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_aio_write AUE_AIO_WRITE
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_lio_listio AUE_LIO_LISTIO
+#define FREEBSD32_SYS_AUE_freebsd32_sched_rr_get_interval AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_sendfile AUE_SENDFILE
#define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_sigaction AUE_SIGACTION
Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h Tue Jul 31 17:15:31
2018 (r336980)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Tue Jul 31 17:16:06
2018 (r336981)
@@ -271,7 +271,7 @@
#define FREEBSD32_SYS_sched_yield 331
#define FREEBSD32_SYS_sched_get_priority_max 332
#define FREEBSD32_SYS_sched_get_priority_min 333
-#define FREEBSD32_SYS_sched_rr_get_interval 334
+#define FREEBSD32_SYS_freebsd32_sched_rr_get_interval 334
#define FREEBSD32_SYS_utrace 335
/* 336 is freebsd4 freebsd32_sendfile */
#define FREEBSD32_SYS_kldsym 337
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Tue Jul 31 17:15:31
2018 (r336980)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Tue Jul 31 17:16:06
2018 (r336981)
@@ -343,7 +343,7 @@ const char *freebsd32_syscallnames[] = {
"sched_yield", /* 331 = sched_yield */
"sched_get_priority_max", /* 332 =
sched_get_priority_max */
"sched_get_priority_min", /* 333 =
sched_get_priority_min */
- "sched_rr_get_interval", /* 334 =
sched_rr_get_interval */
+ "freebsd32_sched_rr_get_interval", /* 334 =
freebsd32_sched_rr_get_interval */
"utrace", /* 335 = utrace */
"compat4.freebsd32_sendfile", /* 336 = freebsd4
freebsd32_sendfile */
"kldsym", /* 337 = kldsym */
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Tue Jul 31 17:15:31
2018 (r336980)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Tue Jul 31 17:16:06
2018 (r336981)
@@ -390,7 +390,7 @@ struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)sys_sched_yield, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 331 = sched_yield */
{ AS(sched_get_priority_max_args), (sy_call_t
*)sys_sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 332 = sched_get_priority_max */
{ AS(sched_get_priority_min_args), (sy_call_t
*)sys_sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 333 = sched_get_priority_min */
- { AS(sched_rr_get_interval_args), (sy_call_t
*)sys_sched_rr_get_interval, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 334 = sched_rr_get_interval */
+ { AS(freebsd32_sched_rr_get_interval_args), (sy_call_t
*)freebsd32_sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 334 = freebsd32_sched_rr_get_interval */
{ AS(utrace_args), (sy_call_t *)sys_utrace, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 335 = utrace */
{ compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile),
AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 336 = freebsd4
freebsd32_sendfile */
{ AS(kldsym_args), (sy_call_t *)sys_kldsym, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 337 = kldsym */
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Tue Jul 31 17:15:31
2018 (r336980)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Tue Jul 31 17:16:06
2018 (r336981)
@@ -1534,11 +1534,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
*n_args = 1;
break;
}
- /* sched_rr_get_interval */
+ /* freebsd32_sched_rr_get_interval */
case 334: {
- struct sched_rr_get_interval_args *p = params;
+ struct freebsd32_sched_rr_get_interval_args *p = params;
iarg[0] = p->pid; /* pid_t */
- uarg[1] = (intptr_t) p->interval; /* struct timespec * */
+ uarg[1] = (intptr_t) p->interval; /* struct timespec32 * */
*n_args = 2;
break;
}
@@ -5669,14 +5669,14 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
};
break;
- /* sched_rr_get_interval */
+ /* freebsd32_sched_rr_get_interval */
case 334:
switch(ndx) {
case 0:
p = "pid_t";
break;
case 1:
- p = "userland struct timespec *";
+ p = "userland struct timespec32 *";
break;
default:
break;
@@ -9658,7 +9658,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* sched_rr_get_interval */
+ /* freebsd32_sched_rr_get_interval */
case 334:
if (ndx == 0 || ndx == 1)
p = "int";
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
