diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:55:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:56:13 +0200 |
| commit | fa08661af834875c9bd6f7f0b1b9388dc72a6585 (patch) | |
| tree | c381fcfcfeb38515bfa93445c80ad9231343414d /tools/perf/util/wrapper.c | |
| parent | rcu: Add synchronize_sched_expedited() rcutorture doc + updates (diff) | |
| parent | Linux 2.6.31-rc6 (diff) | |
| download | linux-dev-fa08661af834875c9bd6f7f0b1b9388dc72a6585.tar.xz linux-dev-fa08661af834875c9bd6f7f0b1b9388dc72a6585.zip | |
Merge commit 'v2.6.31-rc6' into core/rcu
Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/wrapper.c')
| -rw-r--r-- | tools/perf/util/wrapper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/util/wrapper.c b/tools/perf/util/wrapper.c index 6350d65f6d9e..4574ac28396f 100644 --- a/tools/perf/util/wrapper.c +++ b/tools/perf/util/wrapper.c @@ -7,7 +7,7 @@ * There's no pack memory to release - but stay close to the Git * version so wrap this away: */ -static inline void release_pack_memory(size_t size, int flag) +static inline void release_pack_memory(size_t size __used, int flag __used) { } @@ -59,7 +59,8 @@ void *xmemdupz(const void *data, size_t len) char *xstrndup(const char *str, size_t len) { char *p = memchr(str, '\0', len); - return xmemdupz(str, p ? p - str : len); + + return xmemdupz(str, p ? (size_t)(p - str) : len); } void *xrealloc(void *ptr, size_t size) |