d5f1f46341
- add fixes for reserved_va mmap(NULL) case, fixes git build on arm OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=59
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From e300580980d4ac564a7c458717f7415f2528c41f Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Thu, 24 Nov 2011 00:38:22 +0100
|
|
Subject: [PATCH] Revert "linux-user: fix wait* syscall status returns"
|
|
|
|
This reverts commit 93092792064d880eb91679004b4761639d754081.
|
|
---
|
|
linux-user/syscall.c | 8 +-------
|
|
1 files changed, 1 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
index f86fe4a..3e6f3bd 100644
|
|
--- a/linux-user/syscall.c
|
|
+++ b/linux-user/syscall.c
|
|
@@ -4833,10 +4833,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
|
#ifdef TARGET_NR_waitpid
|
|
case TARGET_NR_waitpid:
|
|
{
|
|
- int status = 0;
|
|
- if (arg2) {
|
|
- get_user_s32(status, arg2);
|
|
- }
|
|
+ int status;
|
|
ret = get_errno(waitpid(arg1, &status, arg3));
|
|
if (!is_error(ret) && arg2
|
|
&& put_user_s32(host_to_target_waitstatus(status), arg2))
|
|
@@ -6392,9 +6389,6 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
|
rusage_ptr = &rusage;
|
|
else
|
|
rusage_ptr = NULL;
|
|
- if (status_ptr) {
|
|
- get_user_s32(status, status_ptr);
|
|
- }
|
|
ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr));
|
|
if (!is_error(ret)) {
|
|
if (status_ptr) {
|