Date: Fri, 19 Jul 2013 19:35:05 +0200
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
Message-ID: <20130719173505.GJ6123@two.firstfloor.org>
References: <1374187398-14234-1-git-send-email-andi@firstfloor.org>
 <87ip064k60.wl%mitake.hitoshi@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87ip064k60.wl%mitake.hitoshi@gmail.com>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 970
Lines: 27

> > 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/