tools: Adopt roundup_pow_of_two
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: bd1857948e7667313f9a7bee9b2492c0848174a6 Gitweb: http://git.kernel.org/tip/bd1857948e7667313f9a7bee9b2492c0848174a6 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 16 Dec 2014 13:19:23 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 17 Dec 2014 11:58:15 -0300
tools: Adopt roundup_pow_of_two
To replace equivalent code used in the mmap_pages command line parameter handling in tools/perf.
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/include/linux/log2.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
tools/include/linux/log2.h +25 -0
@@ -48,6 +48,15 @@ bool is_power_of_2(unsigned long n) }/* +* round up to nearest power of two +*/ +static inline __attribute__((const)) +unsigned long __roundup_pow_of_two (unsigned long n) +{ +return 1UL <<fls_long (n -1 ); +} + +/* * round down to nearest power of two */ static inline __attribute__((const))
@@ -141,6 +150,22 @@ unsigned long __rounddown_pow_of_two(unsigned long n) __ilog2_u64(n) \ ) +/** +* roundup_pow_of_two - round the given value up to nearest power of two +* @n - parameter +* +* round the given value up to the nearest power of two +* - the result is undefined when n == 0 +* - this can be used to initialise global variables from constant data +*/ +#define roundup_pow_of_two (n) \ +( \ + __builtin_constant_p(n) ? ( \ + (n == 1) ? 1 : \ + (1UL << (ilog2((n) - 1) + 1)) \ + ) : \ + __roundup_pow_of_two(n) \ + )/** * rounddown_pow_of_two - round the given value down to nearest power of two