diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-11 21:54:01 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-11 21:54:01 +0000 |
| commit | 674ee1245b4f14d998299d83410ac147e6e54eca (patch) | |
| tree | 04ce00f1c8dc6bc547cb59a5b4e9fcc26c8a4163 /linux-user/s390x/target_signal.h | |
| parent | a4c141dca466ed3e9451f147efe6304b1b659ff5 (diff) | |
| parent | c7811022ebfcaae64e06383ff734f3b3651bf892 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-request' into staging
Fixes for epoll_ctl and stack_t
# gpg: Signature made Wed 11 Nov 2020 21:40:16 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:
linux-user: Prevent crash in epoll_ctl
linux-user: Correct definition of stack_t
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/s390x/target_signal.h')
| -rw-r--r-- | linux-user/s390x/target_signal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/s390x/target_signal.h b/linux-user/s390x/target_signal.h index b58bc7c20f..bbfc464d44 100644 --- a/linux-user/s390x/target_signal.h +++ b/linux-user/s390x/target_signal.h @@ -3,7 +3,7 @@ typedef struct target_sigaltstack { abi_ulong ss_sp; - int ss_flags; + abi_int ss_flags; abi_ulong ss_size; } target_stack_t; |