diff options
Diffstat (limited to 'arch/sparc/kernel/process_32.c')
-rw-r--r-- | arch/sparc/kernel/process_32.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index 69d9315f4a93..5a8d8ced33da 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c | |||
@@ -180,13 +180,13 @@ static DEFINE_SPINLOCK(sparc_backtrace_lock); | |||
180 | 180 | ||
181 | void __show_backtrace(unsigned long fp) | 181 | void __show_backtrace(unsigned long fp) |
182 | { | 182 | { |
183 | struct reg_window *rw; | 183 | struct reg_window32 *rw; |
184 | unsigned long flags; | 184 | unsigned long flags; |
185 | int cpu = smp_processor_id(); | 185 | int cpu = smp_processor_id(); |
186 | 186 | ||
187 | spin_lock_irqsave(&sparc_backtrace_lock, flags); | 187 | spin_lock_irqsave(&sparc_backtrace_lock, flags); |
188 | 188 | ||
189 | rw = (struct reg_window *)fp; | 189 | rw = (struct reg_window32 *)fp; |
190 | while(rw && (((unsigned long) rw) >= PAGE_OFFSET) && | 190 | while(rw && (((unsigned long) rw) >= PAGE_OFFSET) && |
191 | !(((unsigned long) rw) & 0x7)) { | 191 | !(((unsigned long) rw) & 0x7)) { |
192 | printk("CPU[%d]: ARGS[%08lx,%08lx,%08lx,%08lx,%08lx,%08lx] " | 192 | printk("CPU[%d]: ARGS[%08lx,%08lx,%08lx,%08lx,%08lx,%08lx] " |
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) | |||
196 | rw->ins[6], | 196 | rw->ins[6], |
197 | rw->ins[7]); | 197 | rw->ins[7]); |
198 | printk("%pS\n", (void *) rw->ins[7]); | 198 | printk("%pS\n", (void *) rw->ins[7]); |
199 | rw = (struct reg_window *) rw->ins[6]; | 199 | rw = (struct reg_window32 *) rw->ins[6]; |
200 | } | 200 | } |
201 | spin_unlock_irqrestore(&sparc_backtrace_lock, flags); | 201 | spin_unlock_irqrestore(&sparc_backtrace_lock, flags); |
202 | } | 202 | } |
@@ -258,7 +258,7 @@ void show_stackframe(struct sparc_stackf *sf) | |||
258 | 258 | ||
259 | void show_regs(struct pt_regs *r) | 259 | void show_regs(struct pt_regs *r) |
260 | { | 260 | { |
261 | struct reg_window *rw = (struct reg_window *) r->u_regs[14]; | 261 | struct reg_window32 *rw = (struct reg_window32 *) r->u_regs[14]; |
262 | 262 | ||
263 | printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n", | 263 | printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n", |
264 | r->psr, r->pc, r->npc, r->y, print_tainted()); | 264 | r->psr, r->pc, r->npc, r->y, print_tainted()); |
@@ -287,7 +287,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
287 | { | 287 | { |
288 | unsigned long pc, fp; | 288 | unsigned long pc, fp; |
289 | unsigned long task_base; | 289 | unsigned long task_base; |
290 | struct reg_window *rw; | 290 | struct reg_window32 *rw; |
291 | int count = 0; | 291 | int count = 0; |
292 | 292 | ||
293 | if (tsk != NULL) | 293 | if (tsk != NULL) |
@@ -301,7 +301,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
301 | if (fp < (task_base + sizeof(struct thread_info)) || | 301 | if (fp < (task_base + sizeof(struct thread_info)) || |
302 | fp >= (task_base + (PAGE_SIZE << 1))) | 302 | fp >= (task_base + (PAGE_SIZE << 1))) |
303 | break; | 303 | break; |
304 | rw = (struct reg_window *) fp; | 304 | rw = (struct reg_window32 *) fp; |
305 | pc = rw->ins[7]; | 305 | pc = rw->ins[7]; |
306 | printk("[%08lx : ", pc); | 306 | printk("[%08lx : ", pc); |
307 | printk("%pS ] ", (void *) pc); | 307 | printk("%pS ] ", (void *) pc); |
@@ -679,7 +679,7 @@ unsigned long get_wchan(struct task_struct *task) | |||
679 | unsigned long pc, fp, bias = 0; | 679 | unsigned long pc, fp, bias = 0; |
680 | unsigned long task_base = (unsigned long) task; | 680 | unsigned long task_base = (unsigned long) task; |
681 | unsigned long ret = 0; | 681 | unsigned long ret = 0; |
682 | struct reg_window *rw; | 682 | struct reg_window32 *rw; |
683 | int count = 0; | 683 | int count = 0; |
684 | 684 | ||
685 | if (!task || task == current || | 685 | if (!task || task == current || |
@@ -692,7 +692,7 @@ unsigned long get_wchan(struct task_struct *task) | |||
692 | if (fp < (task_base + sizeof(struct thread_info)) || | 692 | if (fp < (task_base + sizeof(struct thread_info)) || |
693 | fp >= (task_base + (2 * PAGE_SIZE))) | 693 | fp >= (task_base + (2 * PAGE_SIZE))) |
694 | break; | 694 | break; |
695 | rw = (struct reg_window *) fp; | 695 | rw = (struct reg_window32 *) fp; |
696 | pc = rw->ins[7]; | 696 | pc = rw->ins[7]; |
697 | if (!in_sched_functions(pc)) { | 697 | if (!in_sched_functions(pc)) { |
698 | ret = pc; | 698 | ret = pc; |