Patchwork [1/2] linux-user: Clean up interim solution for exit syscall

login
register
mail settings
Submitter riku.voipio@linaro.org
Date May 3, 2012, 3:15 p.m.
Message ID <209c48491835db84ab728f93209c00954c9e4470.1336057827.git.riku.voipio@linaro.org>
Download mbox | patch
Permalink /patch/156719/
State New
Headers show

Comments

riku.voipio@linaro.org - May 3, 2012, 3:15 p.m.
From: Andreas Färber <afaerber@suse.de>

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>
---
 linux-user/syscall.c |    4 ----
 1 file changed, 4 deletions(-)

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7128618..801b8ed 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);
       }