diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /tools/perf/bench/mem-memcpy.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
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 93c83e3cb4a7..25fd3f1966f1 100644 --- a/tools/perf/bench/mem-memcpy.c +++ b/tools/perf/bench/mem-memcpy.c | |||
| @@ -111,11 +111,11 @@ static double timeval2double(struct timeval *ts) | |||
| 111 | static void alloc_mem(void **dst, void **src, size_t length) | 111 | static void alloc_mem(void **dst, void **src, size_t length) |
| 112 | { | 112 | { |
| 113 | *dst = zalloc(length); | 113 | *dst = zalloc(length); |
| 114 | if (!dst) | 114 | if (!*dst) |
| 115 | die("memory allocation failed - maybe length is too large?\n"); | 115 | die("memory allocation failed - maybe length is too large?\n"); |
| 116 | 116 | ||
| 117 | *src = zalloc(length); | 117 | *src = zalloc(length); |
| 118 | if (!src) | 118 | if (!*src) |
| 119 | die("memory allocation failed - maybe length is too large?\n"); | 119 | die("memory allocation failed - maybe length is too large?\n"); |
| 120 | } | 120 | } |
| 121 | 121 | ||