diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
| commit | ac5ff8f4a72f7b4e66f73c3c6cb9fe7758cf6f12 (patch) | |
| tree | 9fc7f8ce32e0d9a4aa055b2a58a05a5d727b333c /arch/sparc64/mm | |
| parent | 52662ff3e66770fd7e4fc508c91056d29c08bff0 (diff) | |
Sync with Linux 2.1.42.
Diffstat (limited to 'arch/sparc64/mm')
| -rw-r--r-- | arch/sparc64/mm/fault.c | 8 | ||||
| -rw-r--r-- | arch/sparc64/mm/init.c | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index dc28ac339..e23e736a9 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c @@ -1,4 +1,4 @@ -/* $Id: fault.c,v 1.8 1997/05/18 04:16:52 davem Exp $ +/* $Id: fault.c,v 1.9 1997/05/19 05:58:54 davem Exp $ * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -150,13 +150,13 @@ asmlinkage void do_sparc64_fault(struct pt_regs *regs, int text_fault, int write static unsigned long last_addr = 0; static int rcnt = 0; - printk("do_sparc64_fault(PC[%016lx],t[%d],w[%d],addr[%016lx]tag[%016lx]" - "sfar[%016lx])\n", regs->tpc, text_fault, write, address, tag, sfsr); + printk("FAULT(PC[%016lx],t[%d],w[%d],addr[%016lx])\n", + regs->tpc, text_fault, write, address); if(address == last_addr && rcnt++ > 5) { printk("Wheee lotsa bogus faults, something wrong, spinning\n"); while(1) barrier(); - } + } else rcnt = 0; last_addr = address; #endif lock_kernel (); diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index cf378a266..960b3cbbd 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.28 1997/05/18 04:16:53 davem Exp $ +/* $Id: init.c,v 1.29 1997/05/27 06:28:13 davem Exp $ * arch/sparc64/mm/init.c * * Copyright (C) 1996,1997 David S. Miller (davem@caip.rutgers.edu) @@ -269,10 +269,14 @@ void mmu_get_scsi_sgl(struct mmu_sglist *sg, int sz, struct linux_sbus *sbus) } } +static char sfmmuinfo[512]; + char *mmu_info(void) { - /* XXX */ - return "MMU Type: Spitfire\n\tFIXME: Write this\n"; + /* We'll do the rest later to make it nice... -DaveM */ + sprintf(sfmmuinfo, "MMU Type\t: Spitfire\n"); + + return sfmmuinfo; } static unsigned long mempool; |