diff options
| author | Richard Weinberger <richard@nod.at> | 2011-05-12 09:11:11 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 01:42:15 -0400 |
| commit | d39e17c7f8f8fb4012618d25ddc4436407b174a6 (patch) | |
| tree | e2ffb835b63ab744e84090ff91f244c1add8dc6f | |
| parent | c7434dbf29b4803d1caa0d1267fb6a455494d0d7 (diff) | |
sh: remove warning and warning_symbol from struct stacktrace_ops
Both warning and warning_symbol are nowhere used.
Let's get rid of them.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/include/asm/stacktrace.h | 3 | ||||
| -rw-r--r-- | arch/sh/kernel/dumpstack.c | 15 | ||||
| -rw-r--r-- | arch/sh/kernel/perf_callchain.c | 12 | ||||
| -rw-r--r-- | arch/sh/kernel/stacktrace.c | 13 | ||||
| -rw-r--r-- | arch/sh/oprofile/backtrace.c | 13 |
5 files changed, 0 insertions, 56 deletions
diff --git a/arch/sh/include/asm/stacktrace.h b/arch/sh/include/asm/stacktrace.h index 797018213718..a7e2d4dfd087 100644 --- a/arch/sh/include/asm/stacktrace.h +++ b/arch/sh/include/asm/stacktrace.h | |||
| @@ -10,9 +10,6 @@ | |||
| 10 | /* Generic stack tracer with callbacks */ | 10 | /* Generic stack tracer with callbacks */ |
| 11 | 11 | ||
| 12 | struct stacktrace_ops { | 12 | struct stacktrace_ops { |
| 13 | void (*warning)(void *data, char *msg); | ||
| 14 | /* msg must contain %s for the symbol */ | ||
| 15 | void (*warning_symbol)(void *data, char *msg, unsigned long symbol); | ||
| 16 | void (*address)(void *data, unsigned long address, int reliable); | 13 | void (*address)(void *data, unsigned long address, int reliable); |
| 17 | /* On negative return stop dumping */ | 14 | /* On negative return stop dumping */ |
| 18 | int (*stack)(void *data, char *name); | 15 | int (*stack)(void *data, char *name); |
diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c index 6f5ad1513409..694158b9a50f 100644 --- a/arch/sh/kernel/dumpstack.c +++ b/arch/sh/kernel/dumpstack.c | |||
| @@ -69,19 +69,6 @@ stack_reader_dump(struct task_struct *task, struct pt_regs *regs, | |||
| 69 | } | 69 | } |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | static void | ||
| 73 | print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
| 74 | { | ||
| 75 | printk(data); | ||
| 76 | print_symbol(msg, symbol); | ||
| 77 | printk("\n"); | ||
| 78 | } | ||
| 79 | |||
| 80 | static void print_trace_warning(void *data, char *msg) | ||
| 81 | { | ||
| 82 | printk("%s%s\n", (char *)data, msg); | ||
| 83 | } | ||
| 84 | |||
| 85 | static int print_trace_stack(void *data, char *name) | 72 | static int print_trace_stack(void *data, char *name) |
| 86 | { | 73 | { |
| 87 | printk("%s <%s> ", (char *)data, name); | 74 | printk("%s <%s> ", (char *)data, name); |
| @@ -98,8 +85,6 @@ static void print_trace_address(void *data, unsigned long addr, int reliable) | |||
| 98 | } | 85 | } |
| 99 | 86 | ||
| 100 | static const struct stacktrace_ops print_trace_ops = { | 87 | static const struct stacktrace_ops print_trace_ops = { |
| 101 | .warning = print_trace_warning, | ||
| 102 | .warning_symbol = print_trace_warning_symbol, | ||
| 103 | .stack = print_trace_stack, | 88 | .stack = print_trace_stack, |
| 104 | .address = print_trace_address, | 89 | .address = print_trace_address, |
| 105 | }; | 90 | }; |
diff --git a/arch/sh/kernel/perf_callchain.c b/arch/sh/kernel/perf_callchain.c index d5ca1ef50fa9..cc80b614b5fa 100644 --- a/arch/sh/kernel/perf_callchain.c +++ b/arch/sh/kernel/perf_callchain.c | |||
| @@ -14,16 +14,6 @@ | |||
| 14 | #include <asm/unwinder.h> | 14 | #include <asm/unwinder.h> |
| 15 | #include <asm/ptrace.h> | 15 | #include <asm/ptrace.h> |
| 16 | 16 | ||
| 17 | |||
| 18 | static void callchain_warning(void *data, char *msg) | ||
| 19 | { | ||
| 20 | } | ||
| 21 | |||
| 22 | static void | ||
| 23 | callchain_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
| 24 | { | ||
| 25 | } | ||
| 26 | |||
| 27 | static int callchain_stack(void *data, char *name) | 17 | static int callchain_stack(void *data, char *name) |
| 28 | { | 18 | { |
| 29 | return 0; | 19 | return 0; |
| @@ -38,8 +28,6 @@ static void callchain_address(void *data, unsigned long addr, int reliable) | |||
| 38 | } | 28 | } |
| 39 | 29 | ||
| 40 | static const struct stacktrace_ops callchain_ops = { | 30 | static const struct stacktrace_ops callchain_ops = { |
| 41 | .warning = callchain_warning, | ||
| 42 | .warning_symbol = callchain_warning_symbol, | ||
| 43 | .stack = callchain_stack, | 31 | .stack = callchain_stack, |
| 44 | .address = callchain_address, | 32 | .address = callchain_address, |
| 45 | }; | 33 | }; |
diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c index c2e45c48409c..bf989e063a0c 100644 --- a/arch/sh/kernel/stacktrace.c +++ b/arch/sh/kernel/stacktrace.c | |||
| @@ -17,15 +17,6 @@ | |||
| 17 | #include <asm/ptrace.h> | 17 | #include <asm/ptrace.h> |
| 18 | #include <asm/stacktrace.h> | 18 | #include <asm/stacktrace.h> |
| 19 | 19 | ||
| 20 | static void save_stack_warning(void *data, char *msg) | ||
| 21 | { | ||
| 22 | } | ||
| 23 | |||
| 24 | static void | ||
| 25 | save_stack_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
| 26 | { | ||
| 27 | } | ||
| 28 | |||
| 29 | static int save_stack_stack(void *data, char *name) | 20 | static int save_stack_stack(void *data, char *name) |
| 30 | { | 21 | { |
| 31 | return 0; | 22 | return 0; |
| @@ -51,8 +42,6 @@ static void save_stack_address(void *data, unsigned long addr, int reliable) | |||
| 51 | } | 42 | } |
| 52 | 43 | ||
| 53 | static const struct stacktrace_ops save_stack_ops = { | 44 | static const struct stacktrace_ops save_stack_ops = { |
| 54 | .warning = save_stack_warning, | ||
| 55 | .warning_symbol = save_stack_warning_symbol, | ||
| 56 | .stack = save_stack_stack, | 45 | .stack = save_stack_stack, |
| 57 | .address = save_stack_address, | 46 | .address = save_stack_address, |
| 58 | }; | 47 | }; |
| @@ -88,8 +77,6 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable) | |||
| 88 | } | 77 | } |
| 89 | 78 | ||
| 90 | static const struct stacktrace_ops save_stack_ops_nosched = { | 79 | static const struct stacktrace_ops save_stack_ops_nosched = { |
| 91 | .warning = save_stack_warning, | ||
| 92 | .warning_symbol = save_stack_warning_symbol, | ||
| 93 | .stack = save_stack_stack, | 80 | .stack = save_stack_stack, |
| 94 | .address = save_stack_address_nosched, | 81 | .address = save_stack_address_nosched, |
| 95 | }; | 82 | }; |
diff --git a/arch/sh/oprofile/backtrace.c b/arch/sh/oprofile/backtrace.c index 37f3a75ea6cb..9c88dcd56e86 100644 --- a/arch/sh/oprofile/backtrace.c +++ b/arch/sh/oprofile/backtrace.c | |||
| @@ -23,17 +23,6 @@ | |||
| 23 | #include <asm/sections.h> | 23 | #include <asm/sections.h> |
| 24 | #include <asm/stacktrace.h> | 24 | #include <asm/stacktrace.h> |
| 25 | 25 | ||
| 26 | static void backtrace_warning_symbol(void *data, char *msg, | ||
| 27 | unsigned long symbol) | ||
| 28 | { | ||
| 29 | /* Ignore warnings */ | ||
| 30 | } | ||
| 31 | |||
| 32 | static void backtrace_warning(void *data, char *msg) | ||
| 33 | { | ||
| 34 | /* Ignore warnings */ | ||
| 35 | } | ||
| 36 | |||
| 37 | static int backtrace_stack(void *data, char *name) | 26 | static int backtrace_stack(void *data, char *name) |
| 38 | { | 27 | { |
| 39 | /* Yes, we want all stacks */ | 28 | /* Yes, we want all stacks */ |
| @@ -49,8 +38,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) | |||
| 49 | } | 38 | } |
| 50 | 39 | ||
| 51 | static struct stacktrace_ops backtrace_ops = { | 40 | static struct stacktrace_ops backtrace_ops = { |
| 52 | .warning = backtrace_warning, | ||
| 53 | .warning_symbol = backtrace_warning_symbol, | ||
| 54 | .stack = backtrace_stack, | 41 | .stack = backtrace_stack, |
| 55 | .address = backtrace_address, | 42 | .address = backtrace_address, |
| 56 | }; | 43 | }; |
