Skip to content

Commit

Permalink
[PARISC] clean up show_stack
Browse files Browse the repository at this point in the history
When we show_regs, we obviously have a struct pt_regs of the calling
frame. Use these in show_stack so we don't have the entire bogus call trace
up to the show_stack call.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  • Loading branch information
Kyle McMartin committed Mar 16, 2008
1 parent b23f5ba commit dc39455
Showing 1 changed file with 21 additions and 4 deletions.
25 changes: 21 additions & 4 deletions arch/parisc/kernel/traps.c
Expand Up @@ -51,6 +51,9 @@
DEFINE_SPINLOCK(pa_dbit_lock);
#endif

void parisc_show_stack(struct task_struct *t, unsigned long *sp,
struct pt_regs *regs);

static int printbinary(char *buf, unsigned long x, int nbits)
{
unsigned long mask = 1UL << (nbits - 1);
Expand Down Expand Up @@ -149,7 +152,7 @@ void show_regs(struct pt_regs *regs)
printk(level);
print_symbol(" RP(r2): %s\n", regs->gr[2]);

dump_stack();
parisc_show_stack(current, NULL, regs);
}


Expand Down Expand Up @@ -183,11 +186,19 @@ static void do_show_stack(struct unwind_frame_info *info)
printk("\n");
}

void show_stack(struct task_struct *task, unsigned long *s)
void parisc_show_stack(struct task_struct *task, unsigned long *sp,
struct pt_regs *regs)
{
struct unwind_frame_info info;
struct task_struct *t;

t = task ? task : current;
if (regs) {
unwind_frame_init(&info, t, regs);
goto show_stack;
}

if (!task) {
if (t == current) {
unsigned long sp;

HERE:
Expand All @@ -203,12 +214,18 @@ void show_stack(struct task_struct *task, unsigned long *s)
unwind_frame_init(&info, current, &r);
}
} else {
unwind_frame_init_from_blocked_task(&info, task);
unwind_frame_init_from_blocked_task(&info, t);
}

show_stack:
do_show_stack(&info);
}

void show_stack(struct task_struct *t, unsigned long *sp)
{
return parisc_show_stack(t, sp, NULL);
}

int is_valid_bugaddr(unsigned long iaoq)
{
return 1;
Expand Down

0 comments on commit dc39455

Please sign in to comment.