Merge branch 'perf/urgent' into perf/core, to pick up fixes before adding more changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc tools/perf/builtin-record.c
Simple merge

diff --cc tools/perf/builtin-top.c
Simple merge

diff --cc tools/perf/util/machine.c
Simple merge