aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/util/evlist.c2
-rw-r--r--tools/perf/util/util.h18
2 files changed, 1 insertions, 19 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 7d88327d94a9..cbab1fb77b1d 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -948,7 +948,7 @@ static long parse_pages_arg(const char *str, unsigned long min,
948 /* leave number of pages at 0 */ 948 /* leave number of pages at 0 */
949 } else if (!is_power_of_2(pages)) { 949 } else if (!is_power_of_2(pages)) {
950 /* round pages up to next power of 2 */ 950 /* round pages up to next power of 2 */
951 pages = next_pow2_l(pages); 951 pages = roundup_pow_of_two(pages);
952 if (!pages) 952 if (!pages)
953 return -EINVAL; 953 return -EINVAL;
954 pr_info("rounding mmap pages size to %lu bytes (%lu pages)\n", 954 pr_info("rounding mmap pages size to %lu bytes (%lu pages)\n",
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 25b22bbea066..be198ac27031 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -269,24 +269,6 @@ void event_attr_init(struct perf_event_attr *attr);
269#define _STR(x) #x 269#define _STR(x) #x
270#define STR(x) _STR(x) 270#define STR(x) _STR(x)
271 271
272static inline unsigned next_pow2(unsigned x)
273{
274 if (!x)
275 return 1;
276 return 1ULL << (32 - __builtin_clz(x - 1));
277}
278
279static 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
290size_t hex_width(u64 v); 272size_t hex_width(u64 v);
291int hex2u64(const char *ptr, u64 *val); 273int hex2u64(const char *ptr, u64 *val);
292 274