public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: Hitoshi Mitake <mitake.hitoshi@gmail.com>
Cc: Andi Kleen <andi@firstfloor.org>,
	acme@infradead.org, linux-kernel@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>,
	h.mitake@gmail.com, kirill.shutemov@linux.intel.com
Subject: Re: [PATCH] perf, tools, bench: Fix memcpy benchmark for large sizes v2
Date: Fri, 19 Jul 2013 19:35:05 +0200	[thread overview]
Message-ID: <20130719173505.GJ6123@two.firstfloor.org> (raw)
In-Reply-To: <87ip064k60.wl%mitake.hitoshi@gmail.com>

> > diff --git a/tools/perf/bench/mem-memcpy.c b/tools/perf/bench/mem-memcpy.c
> > index 93c83e3..0887b46 100644
> > --- a/tools/perf/bench/mem-memcpy.c
> > +++ b/tools/perf/bench/mem-memcpy.c
> > @@ -115,8 +115,10 @@ static void alloc_mem(void **dst, void **src, size_t length)
> >  		die("memory allocation failed - maybe length is too large?\n");
> >  
> >  	*src = zalloc(length);
> > -	if (!src)
> > +	if (!*src)
> 
> In the latest mem-memcpy.c, this if (!src) is already fixed as if
> (!*src). This modification makes applying fail.

I can undo it, and repost, but the patch would still conflict.

Just whoever applies it has to resolve the trivial conflcit.

-Andi

-- 
ak@linux.intel.com -- Speaking for myself only.

  reply	other threads:[~2013-07-19 17:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-18 22:43 [PATCH] perf, tools, bench: Fix memcpy benchmark for large sizes v2 Andi Kleen
2013-07-19 15:57 ` Hitoshi Mitake
2013-07-19 17:35   ` Andi Kleen [this message]
2013-07-22 16:00   ` Arnaldo Carvalho de Melo
2013-07-22 19:32     ` Andi Kleen

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=20130719173505.GJ6123@two.firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=acme@infradead.org \
    --cc=ak@linux.intel.com \
    --cc=h.mitake@gmail.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mitake.hitoshi@gmail.com \
    /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