From owner-svn-src-head@FreeBSD.ORG Sun Jan 30 20:43:45 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id A3473106566C; Sun, 30 Jan 2011 20:43:45 +0000 (UTC) Date: Sun, 30 Jan 2011 20:43:45 +0000 From: Alexander Best To: Dmitry Chagin Message-ID: <20110130204345.GA29544@freebsd.org> References: <201101302031.p0UKVh2C084795@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201101302031.p0UKVh2C084795@svn.freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218101 - in head/sys: amd64/linux32 i386/linux X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2011 20:43:45 -0000 On Sun Jan 30 11, Dmitry Chagin wrote: > Author: dchagin > Date: Sun Jan 30 20:31:43 2011 > New Revision: 218101 > URL: http://svn.freebsd.org/changeset/base/218101 > > Log: > Change linux futex syscall definition to match actual linux one. nice catch. i'll adjust my FUTEX_WAIT_BITSET/FUTEX_WAKE_BITSET patch accordingly. cheers. alex > > MFC after: 1 Month. > > Modified: > head/sys/amd64/linux32/syscalls.master > head/sys/i386/linux/syscalls.master > > Modified: head/sys/amd64/linux32/syscalls.master > ============================================================================== > --- head/sys/amd64/linux32/syscalls.master Sun Jan 30 18:17:38 2011 (r218100) > +++ head/sys/amd64/linux32/syscalls.master Sun Jan 30 20:31:43 2011 (r218101) > @@ -405,8 +405,8 @@ > 237 AUE_NULL STD { int linux_fremovexattr(void); } > 238 AUE_NULL STD { int linux_tkill(int tid, int sig); } > 239 AUE_SENDFILE UNIMPL linux_sendfile64 > -240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ > - struct l_timespec *timeout, void *uaddr2, int val3); } > +240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, uint32_t val, \ > + struct l_timespec *timeout, uint32_t *uaddr2, uint32_t val3); } > 241 AUE_NULL STD { int linux_sched_setaffinity(l_pid_t pid, l_uint len, \ > l_ulong *user_mask_ptr); } > 242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \ > > Modified: head/sys/i386/linux/syscalls.master > ============================================================================== > --- head/sys/i386/linux/syscalls.master Sun Jan 30 18:17:38 2011 (r218100) > +++ head/sys/i386/linux/syscalls.master Sun Jan 30 20:31:43 2011 (r218101) > @@ -407,8 +407,8 @@ > 237 AUE_NULL STD { int linux_fremovexattr(void); } > 238 AUE_NULL STD { int linux_tkill(int tid, int sig); } > 239 AUE_SENDFILE UNIMPL linux_sendfile64 > -240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ > - struct l_timespec *timeout, void *uaddr2, int val3); } > +240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, uint32_t val, \ > + struct l_timespec *timeout, uint32_t *uaddr2, uint32_t val3); } > 241 AUE_NULL STD { int linux_sched_setaffinity(l_pid_t pid, l_uint len, \ > l_ulong *user_mask_ptr); } > 242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \ -- a13x