From: Ingo Molnar Date: Thu, 18 Dec 2014 06:23:55 +0000 (+0100) Subject: Merge tag 'perf-core-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6aaba7c9011e0d34cf520808467bd7eb36e51b4c;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge tag 'perf-core-for-mingo-2' of git://git./linux/kernel/git/acme/linux into perf/urgent Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: User visible changes: - The mmap address range for the ring buffer now is calculated using the contents of /proc/sys/kernel/perf_event_mlock_kb. This fixes an -EPERM case where 'trace' was trying to use more than what is configured on perf_event_mlock_kb. (Arnaldo Carvalho de Melo) Infrastructure changes: - Move bitops definitions so that they match the header file hierarchy in the kernel sources where that code came from. (Arnaldo Carvalho de Melo) - Adopt round{down,up}_pow_of_two from the kernel and use it instead of equivalent code, so that we reuse more kernel code and make tools/ look more like kernel source code, to encourage further contributions from kernel hackers (Arnaldo Carvalho de Melo) - Fix use after free in filename__read_build_id (Mitchell Krome) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar --- 6aaba7c9011e0d34cf520808467bd7eb36e51b4c