]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
x86: Make save_stack_address() !CONFIG_FRAME_POINTER friendly
authorOleg Nesterov <oleg@redhat.com>
Thu, 3 Jun 2010 19:32:39 +0000 (21:32 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Wed, 9 Jun 2010 15:32:15 +0000 (17:32 +0200)
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>
arch/x86/kernel/stacktrace.c

index ea54d029fe27a1175611c1150db2d961a113d29e..abc321d55870e6ab745c6b6d40452cc144ec52a2 100644 (file)
@@ -26,8 +26,10 @@ static int save_stack_stack(void *data, char *name)
 static void save_stack_address(void *data, unsigned long addr, int reliable)
 {
        struct stack_trace *trace = data;
+#ifdef CONFIG_FRAME_POINTER
        if (!reliable)
                return;
+#endif
        if (trace->skip > 0) {
                trace->skip--;
                return;
@@ -39,9 +41,11 @@ static void save_stack_address(void *data, unsigned long addr, int reliable)
 static void
 save_stack_address_nosched(void *data, unsigned long addr, int reliable)
 {
-       struct stack_trace *trace = (struct stack_trace *)data;
+       struct stack_trace *trace = data;
+#ifdef CONFIG_FRAME_POINTER
        if (!reliable)
                return;
+#endif
        if (in_sched_functions(addr))
                return;
        if (trace->skip > 0) {