| commit | 0ac46af39ee84461782b6f096ba1a165c7b0e503 | [log] [tgz] |
|---|---|---|
| author | Andreas Färber <afaerber@suse.de> | Fri Jul 26 16:42:25 2013 +0200 |
| committer | Andreas Färber <afaerber@suse.de> | Fri Jul 26 23:05:31 2013 +0200 |
| tree | c50600f782511be264fb9ccfd406bac4b27823fd | |
| parent | f0ef1cf4d6c996d90df6e4a32a82423d180f3e4d [diff] |
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 5dc0947..5309117 100644 --- a/linux-user/main.c +++ b/linux-user/main.c
@@ -3637,7 +3637,7 @@ exit(1); } cpu = ENV_GET_CPU(env); - cpu_reset(ENV_GET_CPU(env)); + cpu_reset(cpu); thread_cpu = cpu;