diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:07:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:07:02 +0100 |
| commit | 6c869e772c72d509d0db243a56c205ef48a29baf (patch) | |
| tree | 9a290f1742526a8816f94560cb09bc0a09c910de /arch/x86/kernel/apic | |
| parent | e4e91ac410356da3a518188f371e9d3b52ee38ee (diff) | |
| parent | ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556 (diff) | |
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>
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/hw_nmi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c index 3e25afe9a62..a0e71cb4fa9 100644 --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -17,9 +17,6 @@ #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) { @@ -27,6 +24,10 @@ u64 hw_nmi_get_sample_period(void) } #endif + +/* 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) { |