diff options
| -rw-r--r-- | arch/x86/include/asm/stacktrace.h | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 13 | ||||
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 16 | ||||
| -rw-r--r-- | arch/x86/kernel/stacktrace.c | 13 | ||||
| -rw-r--r-- | arch/x86/oprofile/backtrace.c | 13 |
5 files changed, 0 insertions, 58 deletions
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h index d7e89c83645d..70bbe39043a9 100644 --- a/arch/x86/include/asm/stacktrace.h +++ b/arch/x86/include/asm/stacktrace.h | |||
| @@ -37,9 +37,6 @@ print_context_stack_bp(struct thread_info *tinfo, | |||
| 37 | /* Generic stack tracer with callbacks */ | 37 | /* Generic stack tracer with callbacks */ |
| 38 | 38 | ||
| 39 | struct stacktrace_ops { | 39 | struct stacktrace_ops { |
| 40 | void (*warning)(void *data, char *msg); | ||
| 41 | /* msg must contain %s for the symbol */ | ||
| 42 | void (*warning_symbol)(void *data, char *msg, unsigned long symbol); | ||
| 43 | void (*address)(void *data, unsigned long address, int reliable); | 40 | void (*address)(void *data, unsigned long address, int reliable); |
| 44 | /* On negative return stop dumping */ | 41 | /* On negative return stop dumping */ |
| 45 | int (*stack)(void *data, char *name); | 42 | int (*stack)(void *data, char *name); |
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 0de6b2b31f61..3a0338b4b179 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -1773,17 +1773,6 @@ static struct pmu pmu = { | |||
| 1773 | * callchain support | 1773 | * callchain support |
| 1774 | */ | 1774 | */ |
| 1775 | 1775 | ||
| 1776 | static void | ||
| 1777 | backtrace_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
| 1778 | { | ||
| 1779 | /* Ignore warnings */ | ||
| 1780 | } | ||
| 1781 | |||
| 1782 | static void backtrace_warning(void *data, char *msg) | ||
| 1783 | { | ||
| 1784 | /* Ignore warnings */ | ||
| 1785 | } | ||
| 1786 | |||
| 1787 | static int backtrace_stack(void *data, char *name) | 1776 | static int backtrace_stack(void *data, char *name) |
| 1788 | { | 1777 | { |
| 1789 | return 0; | 1778 | return 0; |
| @@ -1797,8 +1786,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) | |||
| 1797 | } | 1786 | } |
| 1798 | 1787 | ||
| 1799 | static const struct stacktrace_ops backtrace_ops = { | 1788 | static const struct stacktrace_ops backtrace_ops = { |
| 1800 | .warning = backtrace_warning, | ||
| 1801 | .warning_symbol = backtrace_warning_symbol, | ||
| 1802 | .stack = backtrace_stack, | 1789 | .stack = backtrace_stack, |
| 1803 | .address = backtrace_address, | 1790 | .address = backtrace_address, |
| 1804 | .walk_stack = print_context_stack_bp, | 1791 | .walk_stack = print_context_stack_bp, |
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index e2a3f0606da4..f478ff6877ef 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
| @@ -135,20 +135,6 @@ print_context_stack_bp(struct thread_info *tinfo, | |||
| 135 | } | 135 | } |
| 136 | EXPORT_SYMBOL_GPL(print_context_stack_bp); | 136 | EXPORT_SYMBOL_GPL(print_context_stack_bp); |
| 137 | 137 | ||
| 138 | |||
| 139 | static void | ||
| 140 | print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
| 141 | { | ||
| 142 | printk(data); | ||
| 143 | print_symbol(msg, symbol); | ||
| 144 | printk("\n"); | ||
| 145 | } | ||
| 146 | |||
| 147 | static void print_trace_warning(void *data, char *msg) | ||
| 148 | { | ||
| 149 | printk("%s%s\n", (char *)data, msg); | ||
| 150 | } | ||
| 151 | |||
| 152 | static int print_trace_stack(void *data, char *name) | 138 | static int print_trace_stack(void *data, char *name) |
| 153 | { | 139 | { |
| 154 | printk("%s <%s> ", (char *)data, name); | 140 | printk("%s <%s> ", (char *)data, name); |
| @@ -166,8 +152,6 @@ static void print_trace_address(void *data, unsigned long addr, int reliable) | |||
| 166 | } | 152 | } |
| 167 | 153 | ||
| 168 | static const struct stacktrace_ops print_trace_ops = { | 154 | static const struct stacktrace_ops print_trace_ops = { |
| 169 | .warning = print_trace_warning, | ||
| 170 | .warning_symbol = print_trace_warning_symbol, | ||
| 171 | .stack = print_trace_stack, | 155 | .stack = print_trace_stack, |
| 172 | .address = print_trace_address, | 156 | .address = print_trace_address, |
| 173 | .walk_stack = print_context_stack, | 157 | .walk_stack = print_context_stack, |
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c index 6515733a289d..55d9bc03f696 100644 --- a/arch/x86/kernel/stacktrace.c +++ b/arch/x86/kernel/stacktrace.c | |||
| @@ -9,15 +9,6 @@ | |||
| 9 | #include <linux/uaccess.h> | 9 | #include <linux/uaccess.h> |
| 10 | #include <asm/stacktrace.h> | 10 | #include <asm/stacktrace.h> |
| 11 | 11 | ||
| 12 | static void save_stack_warning(void *data, char *msg) | ||
| 13 | { | ||
| 14 | } | ||
| 15 | |||
| 16 | static void | ||
| 17 | save_stack_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
| 18 | { | ||
| 19 | } | ||
| 20 | |||
| 21 | static int save_stack_stack(void *data, char *name) | 12 | static int save_stack_stack(void *data, char *name) |
| 22 | { | 13 | { |
| 23 | return 0; | 14 | return 0; |
| @@ -53,16 +44,12 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable) | |||
| 53 | } | 44 | } |
| 54 | 45 | ||
| 55 | static const struct stacktrace_ops save_stack_ops = { | 46 | static const struct stacktrace_ops save_stack_ops = { |
| 56 | .warning = save_stack_warning, | ||
| 57 | .warning_symbol = save_stack_warning_symbol, | ||
| 58 | .stack = save_stack_stack, | 47 | .stack = save_stack_stack, |
| 59 | .address = save_stack_address, | 48 | .address = save_stack_address, |
| 60 | .walk_stack = print_context_stack, | 49 | .walk_stack = print_context_stack, |
| 61 | }; | 50 | }; |
| 62 | 51 | ||
| 63 | static const struct stacktrace_ops save_stack_ops_nosched = { | 52 | static const struct stacktrace_ops save_stack_ops_nosched = { |
| 64 | .warning = save_stack_warning, | ||
| 65 | .warning_symbol = save_stack_warning_symbol, | ||
| 66 | .stack = save_stack_stack, | 53 | .stack = save_stack_stack, |
| 67 | .address = save_stack_address_nosched, | 54 | .address = save_stack_address_nosched, |
| 68 | .walk_stack = print_context_stack, | 55 | .walk_stack = print_context_stack, |
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c index 2d49d4e19a36..a5b64ab4cd6e 100644 --- a/arch/x86/oprofile/backtrace.c +++ b/arch/x86/oprofile/backtrace.c | |||
| @@ -16,17 +16,6 @@ | |||
| 16 | #include <asm/stacktrace.h> | 16 | #include <asm/stacktrace.h> |
| 17 | #include <linux/compat.h> | 17 | #include <linux/compat.h> |
| 18 | 18 | ||
| 19 | static void backtrace_warning_symbol(void *data, char *msg, | ||
| 20 | unsigned long symbol) | ||
| 21 | { | ||
| 22 | /* Ignore warnings */ | ||
| 23 | } | ||
| 24 | |||
| 25 | static void backtrace_warning(void *data, char *msg) | ||
| 26 | { | ||
| 27 | /* Ignore warnings */ | ||
| 28 | } | ||
| 29 | |||
| 30 | static int backtrace_stack(void *data, char *name) | 19 | static int backtrace_stack(void *data, char *name) |
| 31 | { | 20 | { |
| 32 | /* Yes, we want all stacks */ | 21 | /* Yes, we want all stacks */ |
| @@ -42,8 +31,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) | |||
| 42 | } | 31 | } |
| 43 | 32 | ||
| 44 | static struct stacktrace_ops backtrace_ops = { | 33 | static struct stacktrace_ops backtrace_ops = { |
| 45 | .warning = backtrace_warning, | ||
| 46 | .warning_symbol = backtrace_warning_symbol, | ||
| 47 | .stack = backtrace_stack, | 34 | .stack = backtrace_stack, |
| 48 | .address = backtrace_address, | 35 | .address = backtrace_address, |
| 49 | .walk_stack = print_context_stack, | 36 | .walk_stack = print_context_stack, |
