diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/kernel/process.c | 3 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/process.c | 3 | ||||
-rw-r--r-- | arch/cris/kernel/traps.c | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c index 2ba23c13df68..753e9a03cf87 100644 --- a/arch/cris/arch-v10/kernel/process.c +++ b/arch/cris/arch-v10/kernel/process.c | |||
@@ -176,6 +176,9 @@ unsigned long get_wchan(struct task_struct *p) | |||
176 | void show_regs(struct pt_regs * regs) | 176 | void show_regs(struct pt_regs * regs) |
177 | { | 177 | { |
178 | unsigned long usp = rdusp(); | 178 | unsigned long usp = rdusp(); |
179 | |||
180 | show_regs_print_info(KERN_DEFAULT); | ||
181 | |||
179 | printk("IRP: %08lx SRP: %08lx DCCR: %08lx USP: %08lx MOF: %08lx\n", | 182 | printk("IRP: %08lx SRP: %08lx DCCR: %08lx USP: %08lx MOF: %08lx\n", |
180 | regs->irp, regs->srp, regs->dccr, usp, regs->mof ); | 183 | regs->irp, regs->srp, regs->dccr, usp, regs->mof ); |
181 | printk(" r0: %08lx r1: %08lx r2: %08lx r3: %08lx\n", | 184 | printk(" r0: %08lx r1: %08lx r2: %08lx r3: %08lx\n", |
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c index 57451faa9b20..cebd32e2a8fb 100644 --- a/arch/cris/arch-v32/kernel/process.c +++ b/arch/cris/arch-v32/kernel/process.c | |||
@@ -164,6 +164,9 @@ get_wchan(struct task_struct *p) | |||
164 | void show_regs(struct pt_regs * regs) | 164 | void show_regs(struct pt_regs * regs) |
165 | { | 165 | { |
166 | unsigned long usp = rdusp(); | 166 | unsigned long usp = rdusp(); |
167 | |||
168 | show_regs_print_info(KERN_DEFAULT); | ||
169 | |||
167 | printk("ERP: %08lx SRP: %08lx CCS: %08lx USP: %08lx MOF: %08lx\n", | 170 | printk("ERP: %08lx SRP: %08lx CCS: %08lx USP: %08lx MOF: %08lx\n", |
168 | regs->erp, regs->srp, regs->ccs, usp, regs->mof); | 171 | regs->erp, regs->srp, regs->ccs, usp, regs->mof); |
169 | 172 | ||
diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c index a11ad3229f8c..0ffda73734f5 100644 --- a/arch/cris/kernel/traps.c +++ b/arch/cris/kernel/traps.c | |||
@@ -147,13 +147,6 @@ show_stack(void) | |||
147 | #endif | 147 | #endif |
148 | 148 | ||
149 | void | 149 | void |
150 | dump_stack(void) | ||
151 | { | ||
152 | show_stack(NULL, NULL); | ||
153 | } | ||
154 | EXPORT_SYMBOL(dump_stack); | ||
155 | |||
156 | void | ||
157 | set_nmi_handler(void (*handler)(struct pt_regs *)) | 150 | set_nmi_handler(void (*handler)(struct pt_regs *)) |
158 | { | 151 | { |
159 | nmi_handler = handler; | 152 | nmi_handler = handler; |