Author: dchagin
Date: Sun Feb 26 19:59:28 2017
New Revision: 314313
URL: https://svnweb.freebsd.org/changeset/base/314313
Log:
Regen for r314312 (Linux epoll_pwait).
MFC after: 1 month
Modified:
head/sys/amd64/linux/linux_proto.h
head/sys/amd64/linux/linux_systrace_args.c
head/sys/amd64/linux32/linux32_proto.h
head/sys/amd64/linux32/linux32_systrace_args.c
head/sys/i386/linux/linux_proto.h
head/sys/i386/linux/linux_systrace_args.c
Modified: head/sys/amd64/linux/linux_proto.h
==============================================================================
--- head/sys/amd64/linux/linux_proto.h Sun Feb 26 19:57:18 2017
(r314312)
+++ head/sys/amd64/linux/linux_proto.h Sun Feb 26 19:59:28 2017
(r314313)
@@ -995,6 +995,7 @@ struct linux_epoll_pwait_args {
char maxevents_l_[PADL_(l_int)]; l_int maxevents; char
maxevents_r_[PADR_(l_int)];
char timeout_l_[PADL_(l_int)]; l_int timeout; char
timeout_r_[PADR_(l_int)];
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char
mask_r_[PADR_(l_sigset_t *)];
+ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char
sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_signalfd_args {
register_t dummy;
Modified: head/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- head/sys/amd64/linux/linux_systrace_args.c Sun Feb 26 19:57:18 2017
(r314312)
+++ head/sys/amd64/linux/linux_systrace_args.c Sun Feb 26 19:59:28 2017
(r314313)
@@ -2068,7 +2068,8 @@ systrace_args(int sysnum, void *params,
iarg[2] = p->maxevents; /* l_int */
iarg[3] = p->timeout; /* l_int */
uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */
- *n_args = 5;
+ iarg[5] = p->sigsetsize; /* l_size_t */
+ *n_args = 6;
break;
}
/* linux_signalfd */
@@ -5646,6 +5647,9 @@ systrace_entry_setargdesc(int sysnum, in
case 4:
p = "userland l_sigset_t *";
break;
+ case 5:
+ p = "l_size_t";
+ break;
default:
break;
};
Modified: head/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- head/sys/amd64/linux32/linux32_proto.h Sun Feb 26 19:57:18 2017
(r314312)
+++ head/sys/amd64/linux32/linux32_proto.h Sun Feb 26 19:59:28 2017
(r314313)
@@ -1051,6 +1051,7 @@ struct linux_epoll_pwait_args {
char maxevents_l_[PADL_(l_int)]; l_int maxevents; char
maxevents_r_[PADR_(l_int)];
char timeout_l_[PADL_(l_int)]; l_int timeout; char
timeout_r_[PADR_(l_int)];
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char
mask_r_[PADR_(l_sigset_t *)];
+ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char
sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_utimensat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
Modified: head/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- head/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 26 19:57:18
2017 (r314312)
+++ head/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 26 19:59:28
2017 (r314313)
@@ -2169,7 +2169,8 @@ systrace_args(int sysnum, void *params,
iarg[2] = p->maxevents; /* l_int */
iarg[3] = p->timeout; /* l_int */
uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */
- *n_args = 5;
+ iarg[5] = p->sigsetsize; /* l_size_t */
+ *n_args = 6;
break;
}
/* linux_utimensat */
@@ -5981,6 +5982,9 @@ systrace_entry_setargdesc(int sysnum, in
case 4:
p = "userland l_sigset_t *";
break;
+ case 5:
+ p = "l_size_t";
+ break;
default:
break;
};
Modified: head/sys/i386/linux/linux_proto.h
==============================================================================
--- head/sys/i386/linux/linux_proto.h Sun Feb 26 19:57:18 2017
(r314312)
+++ head/sys/i386/linux/linux_proto.h Sun Feb 26 19:59:28 2017
(r314313)
@@ -1069,6 +1069,7 @@ struct linux_epoll_pwait_args {
char maxevents_l_[PADL_(l_int)]; l_int maxevents; char
maxevents_r_[PADR_(l_int)];
char timeout_l_[PADL_(l_int)]; l_int timeout; char
timeout_r_[PADR_(l_int)];
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char
mask_r_[PADR_(l_sigset_t *)];
+ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char
sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_utimensat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
Modified: head/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- head/sys/i386/linux/linux_systrace_args.c Sun Feb 26 19:57:18 2017
(r314312)
+++ head/sys/i386/linux/linux_systrace_args.c Sun Feb 26 19:59:28 2017
(r314313)
@@ -2245,7 +2245,8 @@ systrace_args(int sysnum, void *params,
iarg[2] = p->maxevents; /* l_int */
iarg[3] = p->timeout; /* l_int */
uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */
- *n_args = 5;
+ iarg[5] = p->sigsetsize; /* l_size_t */
+ *n_args = 6;
break;
}
/* linux_utimensat */
@@ -6212,6 +6213,9 @@ systrace_entry_setargdesc(int sysnum, in
case 4:
p = "userland l_sigset_t *";
break;
+ case 5:
+ p = "l_size_t";
+ break;
default:
break;
};
_______________________________________________
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"
