diff options
| author | Harald Koerfgen <hkoerfg@web.de> | 2000-07-09 11:58:45 +0000 |
|---|---|---|
| committer | Harald Koerfgen <hkoerfg@web.de> | 2000-07-09 11:58:45 +0000 |
| commit | 881f0868e87071a74802b9d5fe6b2045bba8e412 (patch) | |
| tree | ee7f711bf9fae7373eeb3766616e4c529f1ee34c /arch | |
| parent | 493c987f7a352ca64fdb4dc03a21e24cbaf46f55 (diff) | |
DECstation resp. R3000 related -Werror fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/dec/prom/memory.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/mips_ksyms.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/traps.c | 2 | ||||
| -rw-r--r-- | arch/mips/lib/r3k_dump_tlb.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index a093c45bb..1025104ce 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c @@ -155,6 +155,6 @@ void prom_free_prom_memory (void) addr += PAGE_SIZE; } - printk("Freeing unused PROM memory: %dk freed\n", + printk("Freeing unused PROM memory: %ldk freed\n", (end - PAGE_SIZE) >> 10); } diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 53b7a2931..1948a67c2 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -19,7 +19,6 @@ #include <asm/checksum.h> #include <asm/dma.h> -#include <asm/floppy.h> #include <asm/io.h> #include <asm/page.h> #include <asm/pgalloc.h> @@ -27,6 +26,9 @@ #include <asm/sgi/sgihpc.h> #include <asm/softirq.h> #include <asm/uaccess.h> +#ifdef CONFIG_BLK_DEV_FD +#include <asm/floppy.h> +#endif extern void *__bzero(void *__s, size_t __count); extern long __strncpy_from_user_nocheck_asm(char *__to, diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index bc1bd5749..1d8bb4b28 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -431,7 +431,7 @@ void do_ri(struct pt_regs *regs) if ((opcode & OPCODE) == SC) simulate_sc(regs, opcode); } else { - printk("[%s:%ld] Illegal instruction at %08lx ra=%08lx\n", + printk("[%s:%d] Illegal instruction at %08lx ra=%08lx\n", current->comm, current->pid, regs->cp0_epc, regs->regs[31]); } if (compute_return_epc(regs)) diff --git a/arch/mips/lib/r3k_dump_tlb.c b/arch/mips/lib/r3k_dump_tlb.c index 34ee45953..f6b672001 100644 --- a/arch/mips/lib/r3k_dump_tlb.c +++ b/arch/mips/lib/r3k_dump_tlb.c @@ -47,7 +47,7 @@ dump_tlb(int first, int last) printk("Index: %2d ", i); printk("va=%08lx asid=%08lx" - " [pa=%06lx n=%d d=%d v=%d g=%ld]", + " [pa=%06lx n=%d d=%d v=%d g=%d]", (entryhi & 0xffffe000), entryhi & 0xfc0, entrylo0 & PAGE_MASK, |