diff options
Diffstat (limited to 'arch/sparc64/mm/fault.c')
| -rw-r--r-- | arch/sparc64/mm/fault.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 0d8152887..37b07d605 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c @@ -1,4 +1,4 @@ -/* $Id: fault.c,v 1.45 2000/03/27 10:38:51 davem Exp $ +/* $Id: fault.c,v 1.47 2000/04/25 04:13:25 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) @@ -110,7 +110,8 @@ static unsigned int get_user_insn(unsigned long tpc) if(!pte_present(pte)) goto out; - pa = (pte_pagenr(pte) << PAGE_SHIFT) + (tpc & ~PAGE_MASK); + pa = phys_base + (pte_pagenr(pte) << PAGE_SHIFT); + pa += (tpc & ~PAGE_MASK); /* Use phys bypass so we don't pollute dtlb/dcache. */ __asm__ __volatile__("lduwa [%1] %2, %0" @@ -295,7 +296,7 @@ good_area: } { - int fault = handle_mm_fault(current, vma, + int fault = handle_mm_fault(mm, vma, address, (fault_code & FAULT_CODE_WRITE)); if (fault < 0) |