From 139c4f13524f52c7902b33c398185bca1ea20f19 Mon Sep 17 00:00:00 2001 From: dchagin Date: Sat, 9 Jan 2016 17:47:57 +0000 Subject: [PATCH] Regen for r293585. git-svn-id: svn://svn.freebsd.org/base/stable/10@293586 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/amd64/linux32/linux32_proto.h | 4 ++-- sys/amd64/linux32/linux32_syscall.h | 2 +- sys/amd64/linux32/linux32_syscalls.c | 2 +- sys/amd64/linux32/linux32_sysent.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/i386/linux/linux_proto.h | 4 ++-- sys/i386/linux/linux_syscall.h | 2 +- sys/i386/linux/linux_syscalls.c | 2 +- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 245ae0520..05f752f75 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ #ifndef _LINUX_SYSPROTO_H_ @@ -1049,7 +1049,7 @@ struct linux_epoll_pwait_args { char events_l_[PADL_(struct epoll_event *)]; struct epoll_event * events; char events_r_[PADR_(struct epoll_event *)]; 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_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)]; + char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; }; struct linux_utimensat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h index 3beb61a1a..8ab4d57c0 100644 --- a/sys/amd64/linux32/linux32_syscall.h +++ b/sys/amd64/linux32/linux32_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ #define LINUX_SYS_linux_exit 1 diff --git a/sys/amd64/linux32/linux32_syscalls.c b/sys/amd64/linux32/linux32_syscalls.c index 8a9b6bb7b..ad3716ff7 100644 --- a/sys/amd64/linux32/linux32_syscalls.c +++ b/sys/amd64/linux32/linux32_syscalls.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ const char *linux_syscallnames[] = { diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index 94607ce83..9048377f4 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ #include "opt_compat.h" diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 657e4f61b..3104b2138 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -2164,7 +2164,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) uarg[1] = (intptr_t) p->events; /* struct epoll_event * */ iarg[2] = p->maxevents; /* l_int */ iarg[3] = p->timeout; /* l_int */ - uarg[4] = (intptr_t) p->mask; /* l_osigset_t * */ + uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ *n_args = 5; break; } @@ -5581,7 +5581,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 4: - p = "l_osigset_t *"; + p = "l_sigset_t *"; break; default: break; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 35708dfef..dd5686fcf 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: stable/10/sys/i386/linux/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ #ifndef _LINUX_SYSPROTO_H_ @@ -1067,7 +1067,7 @@ struct linux_epoll_pwait_args { char events_l_[PADL_(struct epoll_event *)]; struct epoll_event * events; char events_r_[PADR_(struct epoll_event *)]; 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_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)]; + char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; }; struct linux_utimensat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h index 5e4a1ae80..16c3bf3ff 100644 --- a/sys/i386/linux/linux_syscall.h +++ b/sys/i386/linux/linux_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ #define LINUX_SYS_linux_exit 1 diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c index 21370d7b3..a9f615598 100644 --- a/sys/i386/linux/linux_syscalls.c +++ b/sys/i386/linux/linux_syscalls.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ const char *linux_syscallnames[] = { diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index a2c395996..b2f5b5bf0 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293582 2016-01-09 17:41:00Z dchagin + * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293585 2016-01-09 17:45:02Z dchagin */ #include diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 8827a7248..cb256f90f 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -2240,7 +2240,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) uarg[1] = (intptr_t) p->events; /* struct epoll_event * */ iarg[2] = p->maxevents; /* l_int */ iarg[3] = p->timeout; /* l_int */ - uarg[4] = (intptr_t) p->mask; /* l_osigset_t * */ + uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ *n_args = 5; break; } @@ -5812,7 +5812,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 4: - p = "l_osigset_t *"; + p = "l_sigset_t *"; break; default: break; -- 2.45.0