From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2q9E-00083J-0d for qemu-devel@nongnu.org; Fri, 26 Jul 2013 18:06:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2q9B-000287-Ts for qemu-devel@nongnu.org; Fri, 26 Jul 2013 18:06:03 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47358 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2q9B-00027c-OO for qemu-devel@nongnu.org; Fri, 26 Jul 2013 18:06:01 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 00:05:26 +0200 Message-Id: <1374876350-32189-2-git-send-email-afaerber@suse.de> In-Reply-To: <1374876350-32189-1-git-send-email-afaerber@suse.de> References: <1374876350-32189-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/25] linux-user: Avoid redundant ENV_GET_CPU() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , =?UTF-8?q?Andreas=20F=C3=A4rber?= This fixes a mismerge in 874ec3c5b3821bb964f9f37b2f930f2a9ce51652. Acked-by: Riku Voipio Signed-off-by: Andreas F=C3=A4rber --- linux-user/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c index 5dc0947..5309117 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3637,7 +3637,7 @@ int main(int argc, char **argv, char **envp) exit(1); } cpu =3D ENV_GET_CPU(env); - cpu_reset(ENV_GET_CPU(env)); + cpu_reset(cpu); =20 thread_cpu =3D cpu; =20 --=20 1.8.1.4