From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 26 Nov 2010 14:07:02 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: upstream/snapshot3+hdmi~11667^2~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c869e772c72d509d0db243a56c205ef48a29baf;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

6c869e772c72d509d0db243a56c205ef48a29baf
diff --cc arch/x86/kernel/apic/hw_nmi.c
index 3e25afe,62f6e1e..a0e71cb
--- a/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;