diff options
| author | Anthony Liguori | 2013-07-22 17:13:49 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-07-22 17:13:49 +0200 |
| commit | a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd (patch) | |
| tree | e73da41eb2e8ae610bee6bc624ca55cf98486e96 /linux-user | |
| parent | Merge remote-tracking branch 'stefanha/block' into staging (diff) | |
| parent | doc: monitor multiplexing rewording (diff) | |
| download | qemu-a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd.tar.gz qemu-a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd.tar.xz qemu-a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd.zip | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Michael Tokarev (2) and others
# Via Michael Tokarev
* mjt/trivial-patches:
doc: monitor multiplexing rewording
block/m25p80: Update Micron entries
Fix command example in qemu.sasl
slirp: remove mbuf(m_hdr,m_dat) indirection
linux-user: declare sys_futex to have 6 arguments
Message-id: 1374225073-12959-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index 7f15d3da2b..99c3b3f5ef 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2028,7 +2028,7 @@ static const uint8_t mips_syscall_args[] = { MIPS_SYS(sys_fremovexattr, 2) /* 4235 */ MIPS_SYS(sys_tkill , 2) MIPS_SYS(sys_sendfile64 , 5) - MIPS_SYS(sys_futex , 2) + MIPS_SYS(sys_futex , 6) MIPS_SYS(sys_sched_setaffinity, 3) MIPS_SYS(sys_sched_getaffinity, 3) /* 4240 */ MIPS_SYS(sys_io_setup , 2) |