diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-12-30 23:53:03 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-01-13 04:09:08 -0500 |
commit | 0fb8ee48d9dfff6a0913ceb0be2068d8be203763 (patch) | |
tree | a6178d0c99de3b4a9bdfce6757b79aafed0fe53b /arch/x86/kernel/cpu | |
parent | 61405fea92c42d072d9b8bd189689f1502a838af (diff) |
perf: Drop useless check for ignored frame
The check that ignores the debug and nmi stack frames is useless
now that we have a frame pointer that makes us start at the
right place. We don't anymore have to deal with these.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1262235183-5320-2-git-send-regression-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index d616c06e99b4..b1bb8c550526 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -2297,7 +2297,6 @@ void callchain_store(struct perf_callchain_entry *entry, u64 ip) | |||
2297 | 2297 | ||
2298 | static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry); | 2298 | static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry); |
2299 | static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry); | 2299 | static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry); |
2300 | static DEFINE_PER_CPU(int, in_ignored_frame); | ||
2301 | 2300 | ||
2302 | 2301 | ||
2303 | static void | 2302 | static void |
@@ -2313,10 +2312,6 @@ static void backtrace_warning(void *data, char *msg) | |||
2313 | 2312 | ||
2314 | static int backtrace_stack(void *data, char *name) | 2313 | static int backtrace_stack(void *data, char *name) |
2315 | { | 2314 | { |
2316 | per_cpu(in_ignored_frame, smp_processor_id()) = | ||
2317 | x86_is_stack_id(NMI_STACK, name) || | ||
2318 | x86_is_stack_id(DEBUG_STACK, name); | ||
2319 | |||
2320 | return 0; | 2315 | return 0; |
2321 | } | 2316 | } |
2322 | 2317 | ||
@@ -2324,9 +2319,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) | |||
2324 | { | 2319 | { |
2325 | struct perf_callchain_entry *entry = data; | 2320 | struct perf_callchain_entry *entry = data; |
2326 | 2321 | ||
2327 | if (per_cpu(in_ignored_frame, smp_processor_id())) | ||
2328 | return; | ||
2329 | |||
2330 | if (reliable) | 2322 | if (reliable) |
2331 | callchain_store(entry, addr); | 2323 | callchain_store(entry, addr); |
2332 | } | 2324 | } |