summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-06-27 09:34:36 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-27 09:34:36 -0700
commit81c3dadecfdd71a2fff67fc43656490f8f0e29dd (patch)
tree922fa9c098b186f559fe6cbcf192ef1263f8cf5f
parent44def56aded9afdf76b26368c6bd1506a61a75b2 (diff)
[PATCH] x86 stack dump fixes
- Fix the !CONFIG_FRAME_POINTER && !CONFIG_KALLSYMS output formatting. - Make print_context_stack() static Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/kernel/traps.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index f8eebf6de2f3..b5a1303e337b 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -103,7 +103,7 @@ static int valid_stack_ptr(struct task_struct *task, void *p)
}
#ifdef CONFIG_FRAME_POINTER
-void print_context_stack(struct task_struct *task, unsigned long *stack,
+static void print_context_stack(struct task_struct *task, unsigned long *stack,
unsigned long ebp)
{
unsigned long addr;
@@ -117,7 +117,7 @@ void print_context_stack(struct task_struct *task, unsigned long *stack,
}
}
#else
-void print_context_stack(struct task_struct *task, unsigned long *stack,
+static void print_context_stack(struct task_struct *task, unsigned long *stack,
unsigned long ebp)
{
unsigned long addr;
@@ -125,8 +125,9 @@ void print_context_stack(struct task_struct *task, unsigned long *stack,
while (!kstack_end(stack)) {
addr = *stack++;
if (__kernel_text_address(addr)) {
- printk(" [<%08lx>] ", addr);
- print_symbol("%s\n", addr);
+ printk(" [<%08lx>]", addr);
+ print_symbol(" %s", addr);
+ printk("\n");
}
}
}