Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Mar 2017 19:56:41 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r316290 - in stable/11/sys: amd64/linux amd64/linux32 i386/linux
Message-ID:  <201703301956.v2UJufB1041521@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dchagin
Date: Thu Mar 30 19:56:41 2017
New Revision: 316290
URL: https://svnweb.freebsd.org/changeset/base/316290

Log:
  MFC r314291:
  
  Change Linuxulator timerfd syscalls definition to match actual Linux one.

Modified:
  stable/11/sys/amd64/linux/syscalls.master
  stable/11/sys/amd64/linux32/syscalls.master
  stable/11/sys/i386/linux/syscalls.master
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/linux/syscalls.master
==============================================================================
--- stable/11/sys/amd64/linux/syscalls.master	Thu Mar 30 19:45:07 2017	(r316289)
+++ stable/11/sys/amd64/linux/syscalls.master	Thu Mar 30 19:56:41 2017	(r316290)
@@ -475,12 +475,15 @@
 281     AUE_NULL        STD     { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \
                                         l_int maxevents, l_int timeout, l_sigset_t *mask); }
 282	AUE_NULL	STD	{ int linux_signalfd(void); }
-283	AUE_NULL	STD	{ int linux_timerfd_create(void); }
+283	AUE_NULL	STD	{ int linux_timerfd_create(l_int clockid, l_int flags); }
 284	AUE_NULL	STD	{ int linux_eventfd(l_uint initval); }
 285	AUE_NULL	STD	{ int linux_fallocate(l_int fd, l_int mode, \
 				    l_loff_t offset, l_loff_t len); }
-286	AUE_NULL	STD	{ int linux_timerfd_settime(void); }
-287	AUE_NULL	STD	{ int linux_timerfd_gettime(void); }
+286	AUE_NULL	STD	{ int linux_timerfd_settime(l_int fd, l_int flags,	\
+				    const struct l_itimerspec *new_value,		\
+				    struct l_itimerspec *old_value); }
+287	AUE_NULL	STD	{ int linux_timerfd_gettime(l_int fd,	\
+				    struct l_itimerspec *old_value); }
 288	AUE_ACCEPT	STD	{ int linux_accept4(l_int s, l_uintptr_t addr, \
 				    l_uintptr_t namelen, int flags); }
 ; linux 2.6.27:

Modified: stable/11/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/11/sys/amd64/linux32/syscalls.master	Thu Mar 30 19:45:07 2017	(r316289)
+++ stable/11/sys/amd64/linux32/syscalls.master	Thu Mar 30 19:56:41 2017	(r316290)
@@ -538,14 +538,17 @@
 320	AUE_FUTIMESAT	STD	{ int linux_utimensat(l_int dfd, const char *pathname, \
 					const struct l_timespec *times, l_int flags); }
 321	AUE_NULL	STD	{ int linux_signalfd(void); }
-322	AUE_NULL	STD	{ int linux_timerfd_create(void); }
+322	AUE_NULL	STD	{ int linux_timerfd_create(l_int clockid, l_int flags); }
 323	AUE_NULL	STD	{ int linux_eventfd(l_uint initval); }
 ; linux 2.6.23:
 324	AUE_NULL	STD	{ int linux_fallocate(l_int fd, l_int mode, \
 				    l_loff_t offset, l_loff_t len); }
 ; linux 2.6.25:
-325	AUE_NULL	STD	{ int linux_timerfd_settime(void); }
-326	AUE_NULL	STD	{ int linux_timerfd_gettime(void); }
+325	AUE_NULL	STD	{ int linux_timerfd_settime(l_int fd, l_int flags,	\
+				    const struct l_itimerspec *new_value,		\
+				    struct l_itimerspec *old_value); }
+326	AUE_NULL	STD	{ int linux_timerfd_gettime(l_int fd,	\
+				    struct l_itimerspec *old_value); }
 ; linux 2.6.27:
 327	AUE_NULL	STD	{ int linux_signalfd4(void); }
 328	AUE_NULL	STD	{ int linux_eventfd2(l_uint initval, l_int flags); }

Modified: stable/11/sys/i386/linux/syscalls.master
==============================================================================
--- stable/11/sys/i386/linux/syscalls.master	Thu Mar 30 19:45:07 2017	(r316289)
+++ stable/11/sys/i386/linux/syscalls.master	Thu Mar 30 19:56:41 2017	(r316290)
@@ -546,14 +546,17 @@
 320	AUE_FUTIMESAT	STD	{ int linux_utimensat(l_int dfd, const char *pathname, \
 					const struct l_timespec *times, l_int flags); }
 321	AUE_NULL	STD	{ int linux_signalfd(void); }
-322	AUE_NULL	STD	{ int linux_timerfd_create(void); }
+322	AUE_NULL	STD	{ int linux_timerfd_create(l_int clockid, l_int flags); }
 323	AUE_NULL	STD	{ int linux_eventfd(l_uint initval); }
 ; linux 2.6.23:
 324	AUE_NULL	STD	{ int linux_fallocate(l_int fd, l_int mode, \
 				    l_loff_t offset, l_loff_t len); }
 ; linux 2.6.25:
-325	AUE_NULL	STD	{ int linux_timerfd_settime(void); }
-326	AUE_NULL	STD	{ int linux_timerfd_gettime(void); }
+325	AUE_NULL	STD	{ int linux_timerfd_settime(l_int fd, l_int flags,	\
+				    const struct l_itimerspec *new_value,		\
+				    struct l_itimerspec *old_value); }
+326	AUE_NULL	STD	{ int linux_timerfd_gettime(l_int fd,	\
+				    struct l_itimerspec *old_value); }
 ; linux 2.6.27:
 327	AUE_NULL	STD	{ int linux_signalfd4(void); }
 328	AUE_NULL	STD	{ int linux_eventfd2(l_uint initval, l_int flags); }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703301956.v2UJufB1041521>