aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/stacktrace.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2010-06-03 15:32:39 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2010-06-09 11:32:15 -0400
commit147ec4d2361e355ab32499f739cc24845ceb89da (patch)
treef4e686eb7aea74903ca06b93aa305ba54ad8c17e /arch/x86/kernel/stacktrace.c
parent039ca4e74a1cf60bd7487324a564ecf5c981f254 (diff)
x86: Make save_stack_address() !CONFIG_FRAME_POINTER friendly
If CONFIG_FRAME_POINTER=n, print_context_stack() shouldn't neglect the non-reliable addresses on stack, this is all we have if dump_trace(bp) is called with the wrong or zero bp. For example, /proc/pid/stack doesn't work if CONFIG_FRAME_POINTER=n. This patch obviously has no effect if CONFIG_FRAME_POINTER=y, otherwise it reverts 1650743c "x86: don't save unreliable stack trace entries". Also, remove the unnecessary type-cast. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Cc: Roland McGrath <roland@redhat.com> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Vegard Nossum <vegard.nossum@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <20100603193239.GA31530@redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'arch/x86/kernel/stacktrace.c')
-rw-r--r--arch/x86/kernel/stacktrace.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index ea54d029fe27..abc321d55870 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -26,8 +26,10 @@ static int save_stack_stack(void *data, char *name)
26static void save_stack_address(void *data, unsigned long addr, int reliable) 26static void save_stack_address(void *data, unsigned long addr, int reliable)
27{ 27{
28 struct stack_trace *trace = data; 28 struct stack_trace *trace = data;
29#ifdef CONFIG_FRAME_POINTER
29 if (!reliable) 30 if (!reliable)
30 return; 31 return;
32#endif
31 if (trace->skip > 0) { 33 if (trace->skip > 0) {
32 trace->skip--; 34 trace->skip--;
33 return; 35 return;
@@ -39,9 +41,11 @@ static void save_stack_address(void *data, unsigned long addr, int reliable)
39static void 41static void
40save_stack_address_nosched(void *data, unsigned long addr, int reliable) 42save_stack_address_nosched(void *data, unsigned long addr, int reliable)
41{ 43{
42 struct stack_trace *trace = (struct stack_trace *)data; 44 struct stack_trace *trace = data;
45#ifdef CONFIG_FRAME_POINTER
43 if (!reliable) 46 if (!reliable)
44 return; 47 return;
48#endif
45 if (in_sched_functions(addr)) 49 if (in_sched_functions(addr))
46 return; 50 return;
47 if (trace->skip > 0) { 51 if (trace->skip > 0) {