perf evlist: Use roundup_pow_of_two
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 91529834d1dea9afccb72843c3e547e703ec177f Gitweb: http://git.kernel.org/tip/91529834d1dea9afccb72843c3e547e703ec177f Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 16 Dec 2014 13:24:41 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 17 Dec 2014 11:58:16 -0300
perf evlist: Use roundup_pow_of_two
And remove the equivalent next_pow2{_l} functions.
Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/evlist.c | 2 +- tools/perf/util/util.h | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-)
tools/perf/util/evlist.c +1 -1
@@ -948,7 +948,7 @@ static long parse_pages_arg(const char *str, unsigned long min,/* leave number of pages at 0 */ }else if (!is_power_of_2 (pages)) {/* round pages up to next power of 2 */ - pages =next_pow2_l (pages); + pages =roundup_pow_of_two (pages);if (!pages)return -EINVAL ; pr_info("rounding mmap pages size to %lu bytes (%lu pages)\n",
tools/perf/util/util.h +0 -18
@@ -269,24 +269,6 @@ void event_attr_init(struct perf_event_attr *attr);#define _STR (x) #x#define STR (x) _STR(x) -static inline unsigned next_pow2 (unsigned x) -{ -if (!x) -return 1 ; -return 1ULL << (32 -__builtin_clz (x -1 )); -} - -static inline unsigned long next_pow2_l (unsigned long x) -{ -#if BITS_PER_LONG ==64 -if (x <= (1UL <<31 )) -return next_pow2 (x); -return (unsigned long )next_pow2 (x >>32 ) <<32 ; -#else -return next_pow2 (x); -#endif -} -size_t hex_width (u64 v);int hex2u64 (const char *ptr,u64 *val);