From: Andreas Färber <afaerber@suse.de>
Date: Tue, 1 May 2012 22:10:43 +0000 (+0200)
Subject: linux-user: Clean up interim solution for exit syscall
X-Git-Tag: v1.1-rc1~16^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=209c48491835db84ab728f93209c00954c9e4470;p=thirdparty%2Fqemu.git

linux-user: Clean up interim solution for exit syscall

After all target CPUs have been QOM'ified, we no longer need an #ifdef
to switch between object_delete() and g_free() in NPTL thread exit.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 712861829ab..801b8ed1789 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5045,11 +5045,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
                         NULL, NULL, 0);
           }
           thread_env = NULL;
-#ifdef ENV_GET_CPU
           object_delete(OBJECT(ENV_GET_CPU(cpu_env)));
-#else
-          g_free(cpu_env);
-#endif
           g_free(ts);
           pthread_exit(NULL);
       }