From: Andreas Färber <afaerber@suse.de>
Date: Fri, 26 Jul 2013 14:42:25 +0000 (+0200)
Subject: linux-user: Avoid redundant ENV_GET_CPU()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0ac46af39ee84461782b6f096ba1a165c7b0e503;p=qemu.git

linux-user: Avoid redundant ENV_GET_CPU()

This fixes a mismerge in 874ec3c5b3821bb964f9f37b2f930f2a9ce51652.

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

diff --git a/linux-user/main.c b/linux-user/main.c
index 5dc09471e4..5309117034 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 = ENV_GET_CPU(env);
-    cpu_reset(ENV_GET_CPU(env));
+    cpu_reset(cpu);
 
     thread_cpu = cpu;