Commit 91529834d1dea9afccb72843c3e547e703ec177f
1 parent
bd1857948e
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
perf evlist: Use roundup_pow_of_two
And remove the equivalent next_pow2{_l} functions.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-hl9ct3wcbs5deai3v5ljmuws@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Showing 2 changed files with 1 additions and 19 deletions Side-by-side Diff
tools/perf/util/evlist.c
| ... | ... | @@ -948,7 +948,7 @@ |
| 948 | 948 | /* leave number of pages at 0 */ |
| 949 | 949 | } else if (!is_power_of_2(pages)) { |
| 950 | 950 | /* round pages up to next power of 2 */ |
| 951 | - pages = next_pow2_l(pages); | |
| 951 | + pages = roundup_pow_of_two(pages); | |
| 952 | 952 | if (!pages) |
| 953 | 953 | return -EINVAL; |
| 954 | 954 | pr_info("rounding mmap pages size to %lu bytes (%lu pages)\n", |
tools/perf/util/util.h
| ... | ... | @@ -269,24 +269,6 @@ |
| 269 | 269 | #define _STR(x) #x |
| 270 | 270 | #define STR(x) _STR(x) |
| 271 | 271 | |
| 272 | -static inline unsigned next_pow2(unsigned x) | |
| 273 | -{ | |
| 274 | - if (!x) | |
| 275 | - return 1; | |
| 276 | - return 1ULL << (32 - __builtin_clz(x - 1)); | |
| 277 | -} | |
| 278 | - | |
| 279 | -static inline unsigned long next_pow2_l(unsigned long x) | |
| 280 | -{ | |
| 281 | -#if BITS_PER_LONG == 64 | |
| 282 | - if (x <= (1UL << 31)) | |
| 283 | - return next_pow2(x); | |
| 284 | - return (unsigned long)next_pow2(x >> 32) << 32; | |
| 285 | -#else | |
| 286 | - return next_pow2(x); | |
| 287 | -#endif | |
| 288 | -} | |
| 289 | - | |
| 290 | 272 | size_t hex_width(u64 v); |
| 291 | 273 | int hex2u64(const char *ptr, u64 *val); |
| 292 | 274 |