diff options
| author | Peter Maydell | 2022-02-07 11:48:25 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-02-07 11:48:25 +0100 |
| commit | 55ef0b702bc2c90c3c4ed97f97676d8f139e5ca1 (patch) | |
| tree | 661c14d00b6ff67248d57b697e1feb1355f72048 /linux-user/sparc | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | linux-user/syscall: Translate TARGET_RLIMIT_RTTIME (diff) | |
| download | qemu-55ef0b702bc2c90c3c4ed97f97676d8f139e5ca1.tar.gz qemu-55ef0b702bc2c90c3c4ed97f97676d8f139e5ca1.tar.xz qemu-55ef0b702bc2c90c3c4ed97f97676d8f139e5ca1.zip | |
Merge remote-tracking branch 'remotes/lvivier-gitlab/tags/linux-user-for-7.0-pull-request' into staging
Linux-user pull request 20220207
Fix target rlimits for alpha
Add startime in /proc/self/stat
# gpg: Signature made Mon 07 Feb 2022 08:27:27 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/lvivier-gitlab/tags/linux-user-for-7.0-pull-request:
linux-user/syscall: Translate TARGET_RLIMIT_RTTIME
linux-user: Move generic TARGET_RLIMIT* definitions to generic/target_resource.h
linux-user: Implement starttime field in self stat emulation
linux-user: sigprocmask check read perms first
linux-user: rt_sigprocmask, check read perms first
linux-user: Fix inotify on aarch64
linux-user/alpha: Fix target rlimits for alpha and rearrange for clarity
linux-user: Remove unnecessary 'aligned' attribute from TaskState
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/sparc')
| -rw-r--r-- | linux-user/sparc/target_resource.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/linux-user/sparc/target_resource.h b/linux-user/sparc/target_resource.h new file mode 100644 index 0000000000..d9a2fb814a --- /dev/null +++ b/linux-user/sparc/target_resource.h @@ -0,0 +1,17 @@ +#ifndef SPARC_TARGET_RESOURCE_H +#define SPARC_TARGET_RESOURCE_H + +#include "../generic/target_resource.h" + +#if TARGET_ABI_BITS == 32 +#undef TARGET_RLIM_INFINITY +#define TARGET_RLIM_INFINITY 0x7fffffffUL +#endif + +#undef TARGET_RLIMIT_NOFILE +#define TARGET_RLIMIT_NOFILE 6 + +#undef TARGET_RLIMIT_NPROC +#define TARGET_RLIMIT_NPROC 7 + +#endif |