projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0ef1cf
)
linux-user: Avoid redundant ENV_GET_CPU()
author
Andreas Färber
<afaerber@suse.de>
Fri, 26 Jul 2013 14:42:25 +0000
(16:42 +0200)
committer
Andreas Färber
<afaerber@suse.de>
Fri, 26 Jul 2013 21:05:31 +0000
(23:05 +0200)
This fixes a mismerge in
874ec3c5b3821bb964f9f37b2f930f2a9ce51652
.
Acked-by: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Andreas Färber <afaerber@suse.de>
linux-user/main.c
patch
|
blob
|
history
diff --git
a/linux-user/main.c
b/linux-user/main.c
index 5dc09471e4fe2b6669826cc6a08ba52ae7f09fc2..5309117034aba8de7007edbd6b2fd960bb868c38 100644
(file)
--- 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;