lkml.org 
[lkml]   [2013]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] perf, tools, bench: Fix memcpy benchmark for large sizes v2
> > 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.


\
 
 \ /
  Last update: 2013-07-19 20:21    [W:0.052 / U:0.628 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site