From: Riku Voipio <riku.voipio@iki.fi>
To: "Andreas Färber" <afaerber@suse.de>
Cc: Riku Voipio <riku.voipio@iki.fi>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV_GET_CPU()
Date: Fri, 26 Jul 2013 22:07:23 +0300 [thread overview]
Message-ID: <20130726190723.GA27041@afflict.kos.to> (raw)
In-Reply-To: <1374853454-10999-1-git-send-email-afaerber@suse.de>
On Fri, Jul 26, 2013 at 05:44:14PM +0200, Andreas Färber wrote:
> This fixes a mismerge in 874ec3c5b3821bb964f9f37b2f930f2a9ce51652.
> Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Riku Voipio <riku.voipio@iki.fi>
> ---
> 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 = ENV_GET_CPU(env);
> - cpu_reset(ENV_GET_CPU(env));
> + cpu_reset(cpu);
>
> thread_cpu = cpu;
>
> --
> 1.8.1.4
prev parent reply other threads:[~2013-07-26 19:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 15:44 [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV_GET_CPU() Andreas Färber
2013-07-26 19:07 ` Riku Voipio [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130726190723.GA27041@afflict.kos.to \
--to=riku.voipio@iki.fi \
--cc=afaerber@suse.de \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).