Date: Fri, 17 Jun 2022 19:31:46 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f348d6732b4c - stable/13 - linux(4): Change Linux futex syscall definition to match Linux actual one. Message-ID: <202206171931.25HJVkxC007581@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f348d6732b4cea849330178929f95190367b2bde commit f348d6732b4cea849330178929f95190367b2bde Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2021-06-10 11:00:00 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:30:14 +0000 linux(4): Change Linux futex syscall definition to match Linux actual one. MFC after: 2 weeks (cherry picked from commit 3c1de151e365f05809264352b1d57125d792f373) --- sys/amd64/linux/syscalls.master | 8 ++++---- sys/amd64/linux32/syscalls.master | 4 ++-- sys/arm/linux/syscalls.master | 5 +++-- sys/arm64/linux/syscalls.master | 11 ++++++----- sys/i386/linux/syscalls.master | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 51f9fe00eb7d..0cac26337ef1 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1214,12 +1214,12 @@ } 202 AUE_NULL STD { int linux_sys_futex( - void *uaddr, + uint32_t *uaddr, l_int op, - l_int val, + uint32_t val, struct l_timespec *timeout, - void *uaddr2, - l_int val3 + uint32_t *uaddr2, + uint32_t val3 ); } 203 AUE_NULL STD { diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 79ee1f30a00d..03523f45ced6 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1322,8 +1322,8 @@ } 240 AUE_NULL STD { int linux_sys_futex( - void *uaddr, - int op, + uint32_t *uaddr, + l_int op, uint32_t val, struct l_timespec *timeout, uint32_t *uaddr2, diff --git a/sys/arm/linux/syscalls.master b/sys/arm/linux/syscalls.master index d67f9c3b2069..42adc18bbe1e 100644 --- a/sys/arm/linux/syscalls.master +++ b/sys/arm/linux/syscalls.master @@ -1104,8 +1104,9 @@ ); } 240 AUE_NULL STD { - int linux_sys_futex(void *uaddr, - int op, + int linux_sys_futex( + uint32_t *uaddr, + l_int op, uint32_t val, struct l_timespec *timeout, uint32_t *uaddr2, diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 3d27ed496278..ca45e33d4190 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -596,12 +596,13 @@ int linux_unshare(void); } 98 AUE_NULL STD { - int linux_sys_futex(void *uaddr, - int op, - int val, + int linux_sys_futex( + uint32_t *uaddr, + l_int op, + uint32_t val, struct l_timespec *timeout, - void *uaddr2, - int val3 + uint32_t *uaddr2, + uint32_t val3 ); } 99 AUE_NULL STD { diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index aa6eb7c1c46f..a60129ccdaa9 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1343,8 +1343,8 @@ } 240 AUE_NULL STD { int linux_sys_futex( - void *uaddr, - int op, + uint32_t *uaddr, + l_int op, uint32_t val, struct l_timespec *timeout, uint32_t *uaddr2,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171931.25HJVkxC007581>