diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-25 11:46:53 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-25 11:46:53 +0000 |
commit | 8283f6f82137bec76c41c2a6bbc26689d2766672 (patch) | |
tree | 7c222c19ed3fcb4b39ad6ab162f2cd05f16e3f46 /linux-user/x86_64 | |
parent | d159148b63cb31ba086d26f1b7da24c0614ca856 (diff) | |
parent | f894efd19917321844b31e5dd7a061fdc6fb322d (diff) | |
download | qemu-8283f6f82137bec76c41c2a6bbc26689d2766672.zip qemu-8283f6f82137bec76c41c2a6bbc26689d2766672.tar.gz qemu-8283f6f82137bec76c41c2a6bbc26689d2766672.tar.bz2 |
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160225' into staging
Second pull req with getrandom fix
# gpg: Signature made Thu 25 Feb 2016 10:57:42 GMT using RSA key ID DE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg: aka "Riku Voipio <riku.voipio@linaro.org>"
* remotes/riku/tags/pull-linux-user-20160225:
linux-user: add getrandom() syscall
linux-user: correct timerfd_create syscall numbers
linux-user: remove unavailable syscalls from aarch64
linux-user: sync syscall numbers with kernel
linux-user: Don't assert if guest tries shmdt(0)
linux-user: set ppc64/ppc64le default CPU to POWER8
build: [linux-user] Rename "syscall.h" to "target_syscall.h" in target directories
linux-user: fix realloc size of target_fd_trans.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/x86_64')
-rw-r--r-- | linux-user/x86_64/syscall_nr.h | 15 | ||||
-rw-r--r-- | linux-user/x86_64/target_syscall.h (renamed from linux-user/x86_64/syscall.h) | 5 |
2 files changed, 19 insertions, 1 deletions
diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h index 7c59e3a..16397b3 100644 --- a/linux-user/x86_64/syscall_nr.h +++ b/linux-user/x86_64/syscall_nr.h @@ -281,7 +281,7 @@ #define TARGET_NR_utimensat 280 #define TARGET_NR_epoll_pwait 281 #define TARGET_NR_signalfd 282 -#define TARGET_NR_timerfd 283 +#define TARGET_NR_timerfd_create 283 #define TARGET_NR_eventfd 284 #define TARGET_NR_fallocate 285 #define TARGET_NR_timerfd_settime 286 @@ -312,3 +312,16 @@ #define TARGET_NR_process_vm_writev 311 #define TARGET_NR_kcmp 312 #define TARGET_NR_finit_module 313 +#define TARGET_NR_sched_setattr 314 +#define TARGET_NR_sched_getattr 315 +#define TARGET_NR_renameat2 316 +#define TARGET_NR_seccomp 317 +#define TARGET_NR_getrandom 318 +#define TARGET_NR_memfd_create 319 +#define TARGET_NR_kexec_file_load 320 +#define TARGET_NR_bpf 321 +#define TARGET_NR_execveat 322 +#define TARGET_NR_userfaultfd 323 +#define TARGET_NR_membarrier 324 +#define TARGET_NR_mlock2 325 +#define TARGET_NR_copy_file_range 326 diff --git a/linux-user/x86_64/syscall.h b/linux-user/x86_64/target_syscall.h index 88b3c3f..feecd32 100644 --- a/linux-user/x86_64/syscall.h +++ b/linux-user/x86_64/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + #define __USER_CS (0x33) #define __USER_DS (0x2B) @@ -100,3 +103,5 @@ struct target_msqid64_ds { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */ |