diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-07 10:41:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-07 10:41:48 +0100 |
| commit | b6011bd8a57c1eda81a857d21adeb9b66e58b1b0 (patch) | |
| tree | 571bd286415d0a7e877327695107985a2f304909 /linux-user/syscall_types.h | |
| parent | 2472b6c07bb50179019589af1c22f43935ab7f5c (diff) | |
| parent | 1a1c4db9b298956e89caf53b09b6a7a960d55d66 (diff) | |
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20141006-2' into staging
linux-user pull for 2.2
Clearest linux-user patches sent to the list since august,
Apart from Mikhails patch, the rest are quite trivial.
v2: check for CONFIG_TIMERFD only after it has been defined
# gpg: Signature made Mon 06 Oct 2014 20:08:10 BST 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-20141006-2:
translate-all.c: memory walker initial address miscalculation
linux-user: don't include timerfd if not needed
linux-user: Simplify timerid checks on g_posix_timers range
linux-user: Convert blkpg to use a special subop handler
linux-user: Enable epoll_pwait syscall for ARM
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall_types.h')
| -rw-r--r-- | linux-user/syscall_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h index 9d0c92d054..1fd4ee0bfd 100644 --- a/linux-user/syscall_types.h +++ b/linux-user/syscall_types.h @@ -252,4 +252,4 @@ STRUCT(blkpg_ioctl_arg, TYPE_INT, /* op */ TYPE_INT, /* flags */ TYPE_INT, /* datalen */ - MK_PTR(MK_STRUCT(STRUCT_blkpg_partition))) /* data */ + TYPE_PTRVOID) /* data */ |