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/m68k/syscall_nr.h | |
| 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/m68k/syscall_nr.h')
| -rw-r--r-- | linux-user/m68k/syscall_nr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h index a2daba0..4b50fb2 100644 --- a/linux-user/m68k/syscall_nr.h +++ b/linux-user/m68k/syscall_nr.h @@ -317,7 +317,7 @@ #define TARGET_NR_epoll_pwait 315 #define TARGET_NR_utimensat 316 #define TARGET_NR_signalfd 317 -#define TARGET_NR_timerfd 318 +#define TARGET_NR_timerfd_create 318 #define TARGET_NR_eventfd 319 #define TARGET_NR_fallocate 320 #define TARGET_NR_timerfd_settime 321 |