diff options
| author | Matt Fleming <matt@console-pimps.org> | 2009-08-11 22:43:20 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-13 19:52:53 +0900 |
| commit | 0eff9f66de79a0707a9c3a2f8528ccfd62100f0b (patch) | |
| tree | 72c2cdbda141faec9950438b7e7cd02ddcd59705 | |
| parent | bf61ad1f870be88676a07bfef69acd59ce10172e (diff) | |
sh: Use the new stack unwinder API
Instead of implementing our own stack unwinder via dump_trace() we
should use the new stack unwinder API because it is more modular. This
change allows us to decouple the interface for generating stacktraces
from the implementation of a stack unwinder.
Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/kernel/dumpstack.c | 17 | ||||
| -rw-r--r-- | arch/sh/kernel/stacktrace.c | 5 | ||||
| -rw-r--r-- | arch/sh/oprofile/backtrace.c | 5 |
3 files changed, 12 insertions, 15 deletions
diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c index 6ab996fc612..005dc1d1146 100644 --- a/arch/sh/kernel/dumpstack.c +++ b/arch/sh/kernel/dumpstack.c @@ -6,7 +6,7 @@ #include <linux/kallsyms.h> #include <linux/ftrace.h> #include <linux/debug_locks.h> - +#include <asm/unwinder.h> #include <asm/stacktrace.h> void printk_address(unsigned long address, int reliable) @@ -46,13 +46,10 @@ print_ftrace_graph_addr(unsigned long addr, void *data, { } #endif -/* - * Unwind the call stack and pass information to the stacktrace_ops - * functions. - */ -void dump_trace(struct task_struct *task, struct pt_regs *regs, - unsigned long *sp, const struct stacktrace_ops *ops, - void *data) +void +stack_reader_dump(struct task_struct *task, struct pt_regs *regs, + unsigned long *sp, const struct stacktrace_ops *ops, + void *data) { struct thread_info *context; int graph = 0; @@ -71,8 +68,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, } } } -EXPORT_SYMBOL(dump_trace); - static void print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) @@ -117,7 +112,7 @@ void show_trace(struct task_struct *tsk, unsigned long *sp, printk("\nCall trace:\n"); - dump_trace(tsk, regs, sp, &print_trace_ops, ""); + unwind_stack(tsk, regs, sp, &print_trace_ops, ""); printk("\n"); diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c index 6c24a400b05..45b1adde3ab 100644 --- a/arch/sh/kernel/stacktrace.c +++ b/arch/sh/kernel/stacktrace.c @@ -13,6 +13,7 @@ #include <linux/stacktrace.h> #include <linux/thread_info.h> #include <linux/module.h> +#include <asm/unwinder.h> #include <asm/ptrace.h> #include <asm/stacktrace.h> @@ -57,7 +58,7 @@ void save_stack_trace(struct stack_trace *trace) { unsigned long *sp = (unsigned long *)current_stack_pointer; - dump_trace(current, NULL, sp, &save_stack_ops, trace); + unwind_stack(current, NULL, sp, &save_stack_ops, trace); } EXPORT_SYMBOL_GPL(save_stack_trace); @@ -89,6 +90,6 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) { unsigned long *sp = (unsigned long *)tsk->thread.sp; - dump_trace(current, NULL, sp, &save_stack_ops_nosched, trace); + unwind_stack(current, NULL, sp, &save_stack_ops_nosched, trace); } EXPORT_SYMBOL_GPL(save_stack_trace_tsk); diff --git a/arch/sh/oprofile/backtrace.c b/arch/sh/oprofile/backtrace.c index 62e4e4d0273..37cd75d7930 100644 --- a/arch/sh/oprofile/backtrace.c +++ b/arch/sh/oprofile/backtrace.c @@ -17,6 +17,7 @@ #include <linux/sched.h> #include <linux/kallsyms.h> #include <linux/mm.h> +#include <asm/unwinder.h> #include <asm/ptrace.h> #include <asm/uaccess.h> #include <asm/sections.h> @@ -120,8 +121,8 @@ void sh_backtrace(struct pt_regs * const regs, unsigned int depth) stackaddr = (unsigned long *)regs->regs[15]; if (!user_mode(regs)) { if (depth) - dump_trace(NULL, regs, stackaddr, - &backtrace_ops, &depth); + unwind_stack(NULL, regs, stackaddr, + &backtrace_ops, &depth); return; } |