git: 3c1de151e365 - main - linux(4): Change Linux futex syscall definition to match Linux actual one.

Dmitry Chagin dchagin at FreeBSD.org
Thu Jun 10 11:29:59 UTC 2021


The branch main has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=3c1de151e365f05809264352b1d57125d792f373

commit 3c1de151e365f05809264352b1d57125d792f373
Author:     Dmitry Chagin <dchagin at FreeBSD.org>
AuthorDate: 2021-06-10 11:00:00 +0000
Commit:     Dmitry Chagin <dchagin at FreeBSD.org>
CommitDate: 2021-06-10 11:00:00 +0000

    linux(4): Change Linux futex syscall definition to match Linux actual one.
    
    MFC after:      2 weeks
---
 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 202425581e8e..dcb43553e469 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,


More information about the dev-commits-src-all mailing list