diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /arch/sparc64/mm | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/sparc64/mm')
| -rw-r--r-- | arch/sparc64/mm/fault.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 8c9b7c9fd..9ebe1f494 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c @@ -1,4 +1,4 @@ -/* $Id: fault.c,v 1.49 2000/08/09 00:00:15 davem Exp $ +/* $Id: fault.c,v 1.50 2000/08/11 03:00:13 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) @@ -42,7 +42,7 @@ unsigned long __init prom_probe_memory (void) sp_banks[0].base_addr = base_paddr; sp_banks[0].num_bytes = bytes; - while (mlist->theres_more != (void *) 0){ + while (mlist->theres_more != (void *) 0) { i++; mlist = mlist->theres_more; bytes = mlist->num_bytes; @@ -68,7 +68,7 @@ unsigned long __init prom_probe_memory (void) /* Now mask all bank sizes on a page boundary, it is all we can * use anyways. */ - for(i=0; sp_banks[i].num_bytes != 0; i++) + for (i = 0; sp_banks[i].num_bytes != 0; i++) sp_banks[i].num_bytes &= PAGE_MASK; return tally; @@ -77,7 +77,7 @@ unsigned long __init prom_probe_memory (void) void unhandled_fault(unsigned long address, struct task_struct *tsk, struct pt_regs *regs) { - if((unsigned long) address < PAGE_SIZE) { + if ((unsigned long) address < PAGE_SIZE) { printk(KERN_ALERT "Unable to handle kernel NULL " "pointer dereference\n"); } else { @@ -100,17 +100,17 @@ static unsigned int get_user_insn(unsigned long tpc) unsigned long pa; u32 insn = 0; - if(pgd_none(*pgdp)) + if (pgd_none(*pgdp)) goto out; pmdp = pmd_offset(pgdp, tpc); - if(pmd_none(*pmdp)) + if (pmd_none(*pmdp)) goto out; ptep = pte_offset(pmdp, tpc); pte = *ptep; - if(!pte_present(pte)) + if (!pte_present(pte)) goto out; - pa = phys_base + (sparc64_pte_pagenr(pte) << PAGE_SHIFT); + pa = (pte_val(pte) & _PAGE_PADDR); pa += (tpc & ~PAGE_MASK); /* Use phys bypass so we don't pollute dtlb/dcache. */ |