diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-02 11:45:49 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-02 11:45:49 -0300 |
| commit | 33be4ef116511f1079c4c3bf4b5547faf7439301 (patch) | |
| tree | ce074111ea317b6c9f0274c2aecd513ce78353a3 /tools/perf/bench | |
| parent | 788b94ba6c223d4ce955218d59075cd1edb92692 (diff) | |
| parent | 021f5f12f2ab44874193c68fb19eea154493f83a (diff) | |
| download | linux-33be4ef116511f1079c4c3bf4b5547faf7439301.tar.gz linux-33be4ef116511f1079c4c3bf4b5547faf7439301.tar.bz2 linux-33be4ef116511f1079c4c3bf4b5547faf7439301.zip | |
Merge 'tip/perf/urgent' into perf/core to pick fixes
Needed to build perf/core buildable in some cases.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/bench')
| -rw-r--r-- | tools/perf/bench/mem-memcpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/bench/mem-memcpy.c b/tools/perf/bench/mem-memcpy.c index 6c14afe8c1b1..db1d3a29d97f 100644 --- a/tools/perf/bench/mem-memcpy.c +++ b/tools/perf/bench/mem-memcpy.c @@ -289,7 +289,7 @@ static u64 do_memcpy_cycle(const struct routine *r, size_t len, bool prefault) memcpy_t fn = r->fn.memcpy; int i; - memcpy_alloc_mem(&src, &dst, len); + memcpy_alloc_mem(&dst, &src, len); if (prefault) fn(dst, src, len); @@ -312,7 +312,7 @@ static double do_memcpy_gettimeofday(const struct routine *r, size_t len, void *src = NULL, *dst = NULL; int i; - memcpy_alloc_mem(&src, &dst, len); + memcpy_alloc_mem(&dst, &src, len); if (prefault) fn(dst, src, len); |