diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
| commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
| tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /tools/perf/bench/mem-memcpy.c | |
| parent | 7e8e385aaf6ed5b64b5d9108081cfcdcdd021b78 (diff) | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/bench/mem-memcpy.c')
| -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) | |||
| 289 | memcpy_t fn = r->fn.memcpy; | 289 | memcpy_t fn = r->fn.memcpy; |
| 290 | int i; | 290 | int i; |
| 291 | 291 | ||
| 292 | memcpy_alloc_mem(&src, &dst, len); | 292 | memcpy_alloc_mem(&dst, &src, len); |
| 293 | 293 | ||
| 294 | if (prefault) | 294 | if (prefault) |
| 295 | fn(dst, src, len); | 295 | fn(dst, src, len); |
| @@ -312,7 +312,7 @@ static double do_memcpy_gettimeofday(const struct routine *r, size_t len, | |||
| 312 | void *src = NULL, *dst = NULL; | 312 | void *src = NULL, *dst = NULL; |
| 313 | int i; | 313 | int i; |
| 314 | 314 | ||
| 315 | memcpy_alloc_mem(&src, &dst, len); | 315 | memcpy_alloc_mem(&dst, &src, len); |
| 316 | 316 | ||
| 317 | if (prefault) | 317 | if (prefault) |
| 318 | fn(dst, src, len); | 318 | fn(dst, src, len); |