Merge branch 'perf/urgent' into perf/core

Conflicts:
	arch/x86/kernel/apic/hw_nmi.c

Merge reason: Resolve conflict, queue up dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/apic/hw_nmi.c
index 3e25afe9a62a85d222aad06c84eb93a9aed25e6b,62f6e1e55b90d7f9a2bc460e73ba8895da23c4ff..a0e71cb4fa9ccf6fc790ff1a0d98743fcdbae1fc
--- 1/arch/x86/kernel/apic/hw_nmi.c
--- 2/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@@ -17,17 -17,16 +17,18 @@@
  #include <linux/nmi.h>
  #include <linux/module.h>
  
- /* For reliability, we're prepared to waste bits here. */
- static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
- 
 +#ifdef CONFIG_HARDLOCKUP_DETECTOR
  u64 hw_nmi_get_sample_period(void)
  {
        return (u64)(cpu_khz) * 1000 * 60;
  }
 +#endif
  
 -#ifdef ARCH_HAS_NMI_WATCHDOG
+ 
+ /* For reliability, we're prepared to waste bits here. */
+ static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
+ 
 +#ifdef arch_trigger_all_cpu_backtrace
  void arch_trigger_all_cpu_backtrace(void)
  {
        int i;

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

diff --cc kernel/perf_event.c
Simple merge

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