diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 21:34:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 21:34:29 +0000 |
| commit | 913c94403b96b4c381bd40f9588839612d71d2e9 (patch) | |
| tree | 810e669fed6232fa9d37f8ce830d046d319c9cf0 /arch/mips64/kernel/traps.c | |
| parent | 9f2b43b25e6ab17ac47b7754a157e01075cb5ba9 (diff) | |
Kill warnings in the 64-bit kernel.
Diffstat (limited to 'arch/mips64/kernel/traps.c')
| -rw-r--r-- | arch/mips64/kernel/traps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips64/kernel/traps.c b/arch/mips64/kernel/traps.c index f9b322534..997aee0c7 100644 --- a/arch/mips64/kernel/traps.c +++ b/arch/mips64/kernel/traps.c @@ -183,7 +183,7 @@ void die(const char * str, struct pt_regs * regs, unsigned long err) spin_lock_irq(&die_lock); printk("%s: %04lx\n", str, err & 0xffff); show_regs(regs); - printk("Process %s (pid: %ld, stackpage=%08lx)\n", + printk("Process %s (pid: %d, stackpage=%08lx)\n", current->comm, current->pid, (unsigned long) current); show_stack((unsigned long *) regs->regs[29]); show_trace((unsigned long *) regs->regs[29]); @@ -233,6 +233,7 @@ void do_fpe(struct pt_regs *regs, unsigned long fcr31) { unsigned long pc; unsigned int insn; + extern void simfp(unsigned int); #ifdef CONFIG_MIPS_FPE_MODULE if (fpe_handler != NULL) { @@ -326,7 +327,7 @@ void do_tr(struct pt_regs *regs) void do_ri(struct pt_regs *regs) { - printk("Cpu%d[%s:%ld] Illegal instruction at %08lx ra=%08lx\n", + printk("Cpu%d[%s:%d] Illegal instruction at %08lx ra=%08lx\n", smp_processor_id(), current->comm, current->pid, regs->cp0_epc, regs->regs[31]); if (compute_return_epc(regs)) @@ -387,7 +388,7 @@ void do_reserved(struct pt_regs *regs) * caused by a new unknown cpu type or after another deadly * hard/software error. */ - panic("Caught reserved exception %d - should not happen.", + panic("Caught reserved exception %ld - should not happen.", (regs->cp0_cause & 0x1f) >> 2); } |