diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /arch/ppc/mm | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'arch/ppc/mm')
| -rw-r--r-- | arch/ppc/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/ppc/mm/init.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c index 92299e825..fde053df9 100644 --- a/arch/ppc/mm/fault.c +++ b/arch/ppc/mm/fault.c @@ -89,7 +89,6 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, printk("page fault in interrupt handler, addr=%lx\n", address); show_regs(regs); - instruction_dump((unsigned long *)regs->nip); #if defined(CONFIG_XMON) || defined(CONFIG_KGDB) if (debugger_kernel_faults) debugger(regs); @@ -176,7 +175,6 @@ bad_page_fault(struct pt_regs *regs, unsigned long address) /* kernel has accessed a bad area */ show_regs(regs); print_backtrace( (unsigned long *)regs->gpr[1] ); - instruction_dump((unsigned long *)regs->nip); #if defined(CONFIG_XMON) || defined(CONFIG_KGDB) if (debugger_kernel_faults) debugger(regs); diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index eac750568..afd84c499 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c @@ -1,5 +1,5 @@ /* - * $Id: init.c,v 1.164 1999/05/05 17:33:55 cort Exp $ + * $Id: init.c,v 1.166 1999/05/22 18:18:30 cort Exp $ * * PowerPC version * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) @@ -402,7 +402,7 @@ __ioremap(unsigned long addr, unsigned long size, unsigned long flags) for (i = 0; i < size; i += PAGE_SIZE) map_page(&init_task, v+i, p+i, flags); out: - return (void *) (v + (p & ~PAGE_MASK)); + return (void *) (v + (addr & ~PAGE_MASK)); } void iounmap(void *addr) @@ -1510,7 +1510,7 @@ __initfunc(static void hash_init(void)) for (h = 256<<10; h < ramsize / 256 && h < 4<<20; h *= 2, Hash_mask++) ; Hash_size = h; - Hash_mask << 10; /* so setting _SDR1 works the same -- Cort */ + Hash_mask <<= 10; /* so setting _SDR1 works the same -- Cort */ #else for (h = 64<<10; h < ramsize / 256 && h < 2<<20; h *= 2) ; |