diff options
author | Peter Maydell | 2020-10-28 16:08:35 +0100 |
---|---|---|
committer | Peter Maydell | 2020-10-28 16:08:36 +0100 |
commit | 5c27a8551857e3e7ecac6f4b99ffb0dea73b2be6 (patch) | |
tree | 887501eef5ccc7d30fc813978ecb1a0f8aa3dd73 /linux-user/mips | |
parent | Revert series: virtiofsd: Announce submounts to the guest (diff) | |
parent | target/xtensa: enable all coprocessors for linux-user (diff) | |
download | qemu-5c27a8551857e3e7ecac6f4b99ffb0dea73b2be6.tar.gz qemu-5c27a8551857e3e7ecac6f4b99ffb0dea73b2be6.tar.xz qemu-5c27a8551857e3e7ecac6f4b99ffb0dea73b2be6.zip |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-request' into staging
Update syscall numbers to 5.9-rc7
Fixes for prctl(), accept4() and xtensa
# gpg: Signature made Mon 26 Oct 2020 22:02:56 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-5.2-pull-request:
target/xtensa: enable all coprocessors for linux-user
linux-user: correct errno returned from accept4() syscall
linux-user: remove _sysctl
linux-user: update syscall.tbl to Linux 5.9-rc7
linux-user: update mips/syscall-args-o32.c.inc to Linux 5.9-rc7
linux-user: update syscall_nr.h to Linux 5.9-rc7
linux-user: Support f_flags in statfs64 when available.
Fix stack smashing when handling PR_GET_PDEATHSIG
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/mips')
-rw-r--r-- | linux-user/mips/syscall-args-o32.c.inc | 4 | ||||
-rw-r--r-- | linux-user/mips/syscall_o32.tbl | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/linux-user/mips/syscall-args-o32.c.inc b/linux-user/mips/syscall-args-o32.c.inc index 0ad35857b4..92ee4f921e 100644 --- a/linux-user/mips/syscall-args-o32.c.inc +++ b/linux-user/mips/syscall-args-o32.c.inc @@ -434,3 +434,7 @@ [ 433] = 3, /* fspick */ [ 434] = 2, /* pidfd_open */ [ 435] = 2, /* clone3 */ + [ 436] = 3, /* close_range */ + [ 437] = 4, /* openat2 */ + [ 438] = 3, /* pidfd_getfd */ + [ 439] = 4, /* faccessat2 */ diff --git a/linux-user/mips/syscall_o32.tbl b/linux-user/mips/syscall_o32.tbl index ac586774c9..195b43cf27 100644 --- a/linux-user/mips/syscall_o32.tbl +++ b/linux-user/mips/syscall_o32.tbl @@ -164,7 +164,7 @@ 150 o32 unused150 sys_ni_syscall 151 o32 getsid sys_getsid 152 o32 fdatasync sys_fdatasync -153 o32 _sysctl sys_sysctl compat_sys_sysctl +153 o32 _sysctl sys_ni_syscall 154 o32 mlock sys_mlock 155 o32 munlock sys_munlock 156 o32 mlockall sys_mlockall @@ -184,7 +184,7 @@ 170 o32 connect sys_connect 171 o32 getpeername sys_getpeername 172 o32 getsockname sys_getsockname -173 o32 getsockopt sys_getsockopt compat_sys_getsockopt +173 o32 getsockopt sys_getsockopt sys_getsockopt 174 o32 listen sys_listen 175 o32 recv sys_recv compat_sys_recv 176 o32 recvfrom sys_recvfrom compat_sys_recvfrom @@ -192,7 +192,7 @@ 178 o32 send sys_send 179 o32 sendmsg sys_sendmsg compat_sys_sendmsg 180 o32 sendto sys_sendto -181 o32 setsockopt sys_setsockopt compat_sys_setsockopt +181 o32 setsockopt sys_setsockopt sys_setsockopt 182 o32 shutdown sys_shutdown 183 o32 socket sys_socket 184 o32 socketpair sys_socketpair @@ -423,5 +423,7 @@ 433 o32 fspick sys_fspick 434 o32 pidfd_open sys_pidfd_open 435 o32 clone3 __sys_clone3 +436 o32 close_range sys_close_range 437 o32 openat2 sys_openat2 438 o32 pidfd_getfd sys_pidfd_getfd +439 o32 faccessat2 sys_faccessat2 |