Messages in this thread | | | Date | Fri, 19 Jul 2013 19:35:05 +0200 | From | Andi Kleen <> | Subject | Re: [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.
| |