diff options
| author | Richard Weinberger <richard@nod.at> | 2013-11-21 09:27:37 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2013-12-01 13:06:51 +0100 |
| commit | 8ed12fcc194d93c6a17714120a7027ee4d76a881 (patch) | |
| tree | fda3975f218874d047f6bf0554e420518f01af1b | |
| parent | af91706d5ddecb4a9858cca9e90d463037cfd498 (diff) | |
| download | linux-stable-8ed12fcc194d93c6a17714120a7027ee4d76a881.tar.gz linux-stable-8ed12fcc194d93c6a17714120a7027ee4d76a881.tar.bz2 linux-stable-8ed12fcc194d93c6a17714120a7027ee4d76a881.zip | |
um: Rename print_stack_trace to do_stack_trace
We cannot use print_stack_trace because the name conflicts
with linux/stacktrace.h.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | arch/um/kernel/sysrq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c index 4d6fdf68edf3..799d7e413bf5 100644 --- a/arch/um/kernel/sysrq.c +++ b/arch/um/kernel/sysrq.c @@ -19,7 +19,7 @@ struct stack_frame { unsigned long return_address; }; -static void print_stack_trace(unsigned long *sp, unsigned long bp) +static void do_stack_trace(unsigned long *sp, unsigned long bp) { int reliable; unsigned long addr; @@ -94,5 +94,5 @@ void show_stack(struct task_struct *task, unsigned long *stack) } printk(KERN_CONT "\n"); - print_stack_trace(sp, bp); + do_stack_trace(sp, bp); } |