perf evlist: Use roundup_pow_of_two (91529834) · Commits · 戴 / test

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>

tools/perf/util/evlist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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);

Admin message