From patchwork Thu May 3 15:15:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 156719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 904F2B6FBA for ; Fri, 4 May 2012 01:16:36 +1000 (EST) Received: from localhost ([::1]:41714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPxli-0003gT-CF for incoming@patchwork.ozlabs.org; Thu, 03 May 2012 11:16:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPxlC-0002Uy-7Y for qemu-devel@nongnu.org; Thu, 03 May 2012 11:16:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPxl5-0004Wb-DZ for qemu-devel@nongnu.org; Thu, 03 May 2012 11:16:01 -0400 Received: from afflict.kos.to ([92.243.29.197]:42481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPxl5-0004Vu-68 for qemu-devel@nongnu.org; Thu, 03 May 2012 11:15:55 -0400 Received: by afflict.kos.to (Postfix, from userid 1000) id 45827264BF; Thu, 3 May 2012 17:15:52 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Thu, 3 May 2012 18:15:51 +0300 Message-Id: <209c48491835db84ab728f93209c00954c9e4470.1336057827.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 92.243.29.197 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 1/2] linux-user: Clean up interim solution for exit syscall X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Färber 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 Signed-off-by: Riku Voipio --- linux-user/syscall.c | 4 ---- 1 file changed, 4 deletions(-) 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); }