diff options
-rw-r--r-- | arch/x86/kernel/dumpstack_64.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 346b1df2412e..74c262a9b9f1 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c | |||
@@ -115,19 +115,18 @@ enum stack_type { | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | static enum stack_type | 117 | static enum stack_type |
118 | analyze_stack(int cpu, struct task_struct *task, | 118 | analyze_stack(int cpu, struct task_struct *task, unsigned long *stack, |
119 | unsigned long *stack, unsigned long **stack_end, char **id) | 119 | unsigned long **stack_end, unsigned *used, char **id) |
120 | { | 120 | { |
121 | unsigned long *irq_stack; | 121 | unsigned long *irq_stack; |
122 | unsigned long addr; | 122 | unsigned long addr; |
123 | unsigned used = 0; | ||
124 | 123 | ||
125 | addr = ((unsigned long)stack & (~(THREAD_SIZE - 1))); | 124 | addr = ((unsigned long)stack & (~(THREAD_SIZE - 1))); |
126 | if ((unsigned long)task_stack_page(task) == addr) | 125 | if ((unsigned long)task_stack_page(task) == addr) |
127 | return STACK_IS_NORMAL; | 126 | return STACK_IS_NORMAL; |
128 | 127 | ||
129 | *stack_end = in_exception_stack(cpu, (unsigned long)stack, | 128 | *stack_end = in_exception_stack(cpu, (unsigned long)stack, |
130 | &used, id); | 129 | used, id); |
131 | if (*stack_end) | 130 | if (*stack_end) |
132 | return STACK_IS_EXCEPTION; | 131 | return STACK_IS_EXCEPTION; |
133 | 132 | ||
@@ -158,6 +157,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
158 | struct thread_info *tinfo; | 157 | struct thread_info *tinfo; |
159 | unsigned long *irq_stack; | 158 | unsigned long *irq_stack; |
160 | unsigned long dummy; | 159 | unsigned long dummy; |
160 | unsigned used = 0; | ||
161 | int graph = 0; | 161 | int graph = 0; |
162 | int done = 0; | 162 | int done = 0; |
163 | 163 | ||
@@ -186,7 +186,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
186 | enum stack_type stype; | 186 | enum stack_type stype; |
187 | char *id; | 187 | char *id; |
188 | 188 | ||
189 | stype = analyze_stack(cpu, task, stack, &stack_end, &id); | 189 | stype = analyze_stack(cpu, task, stack, &stack_end, &used, &id); |
190 | 190 | ||
191 | /* Default finish unless specified to continue */ | 191 | /* Default finish unless specified to continue */ |
192 | done = 1; | 192 | done = 1; |