diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/stacktrace.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/traps_32.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/traps_64.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c index 413e527cdeb9..6fa6cf036c70 100644 --- a/arch/x86/kernel/stacktrace.c +++ b/arch/x86/kernel/stacktrace.c | |||
@@ -33,7 +33,7 @@ static void save_stack_address(void *data, unsigned long addr) | |||
33 | trace->entries[trace->nr_entries++] = addr; | 33 | trace->entries[trace->nr_entries++] = addr; |
34 | } | 34 | } |
35 | 35 | ||
36 | static struct stacktrace_ops save_stack_ops = { | 36 | static const struct stacktrace_ops save_stack_ops = { |
37 | .warning = save_stack_warning, | 37 | .warning = save_stack_warning, |
38 | .warning_symbol = save_stack_warning_symbol, | 38 | .warning_symbol = save_stack_warning_symbol, |
39 | .stack = save_stack_stack, | 39 | .stack = save_stack_stack, |
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 0fce34226b7d..83a9bbbbe38f 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -112,7 +112,7 @@ struct stack_frame { | |||
112 | 112 | ||
113 | static inline unsigned long print_context_stack(struct thread_info *tinfo, | 113 | static inline unsigned long print_context_stack(struct thread_info *tinfo, |
114 | unsigned long *stack, unsigned long ebp, | 114 | unsigned long *stack, unsigned long ebp, |
115 | struct stacktrace_ops *ops, void *data) | 115 | const struct stacktrace_ops *ops, void *data) |
116 | { | 116 | { |
117 | #ifdef CONFIG_FRAME_POINTER | 117 | #ifdef CONFIG_FRAME_POINTER |
118 | struct stack_frame *frame = (struct stack_frame *)ebp; | 118 | struct stack_frame *frame = (struct stack_frame *)ebp; |
@@ -149,7 +149,7 @@ static inline unsigned long print_context_stack(struct thread_info *tinfo, | |||
149 | 149 | ||
150 | void dump_trace(struct task_struct *task, struct pt_regs *regs, | 150 | void dump_trace(struct task_struct *task, struct pt_regs *regs, |
151 | unsigned long *stack, | 151 | unsigned long *stack, |
152 | struct stacktrace_ops *ops, void *data) | 152 | const struct stacktrace_ops *ops, void *data) |
153 | { | 153 | { |
154 | unsigned long ebp = 0; | 154 | unsigned long ebp = 0; |
155 | 155 | ||
@@ -221,7 +221,7 @@ static void print_trace_address(void *data, unsigned long addr) | |||
221 | touch_nmi_watchdog(); | 221 | touch_nmi_watchdog(); |
222 | } | 222 | } |
223 | 223 | ||
224 | static struct stacktrace_ops print_trace_ops = { | 224 | static const struct stacktrace_ops print_trace_ops = { |
225 | .warning = print_trace_warning, | 225 | .warning = print_trace_warning, |
226 | .warning_symbol = print_trace_warning_symbol, | 226 | .warning_symbol = print_trace_warning_symbol, |
227 | .stack = print_trace_stack, | 227 | .stack = print_trace_stack, |
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index bc7116acf8ff..b4a9b3db1994 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -215,7 +215,7 @@ static inline int valid_stack_ptr(struct thread_info *tinfo, void *p) | |||
215 | 215 | ||
216 | void dump_trace(struct task_struct *tsk, struct pt_regs *regs, | 216 | void dump_trace(struct task_struct *tsk, struct pt_regs *regs, |
217 | unsigned long *stack, | 217 | unsigned long *stack, |
218 | struct stacktrace_ops *ops, void *data) | 218 | const struct stacktrace_ops *ops, void *data) |
219 | { | 219 | { |
220 | const unsigned cpu = get_cpu(); | 220 | const unsigned cpu = get_cpu(); |
221 | unsigned long *irqstack_end = (unsigned long*)cpu_pda(cpu)->irqstackptr; | 221 | unsigned long *irqstack_end = (unsigned long*)cpu_pda(cpu)->irqstackptr; |
@@ -336,7 +336,7 @@ static void print_trace_address(void *data, unsigned long addr) | |||
336 | printk_address(addr); | 336 | printk_address(addr); |
337 | } | 337 | } |
338 | 338 | ||
339 | static struct stacktrace_ops print_trace_ops = { | 339 | static const struct stacktrace_ops print_trace_ops = { |
340 | .warning = print_trace_warning, | 340 | .warning = print_trace_warning, |
341 | .warning_symbol = print_trace_warning_symbol, | 341 | .warning_symbol = print_trace_warning_symbol, |
342 | .stack = print_trace_stack, | 342 | .stack = print_trace_stack, |