patch-2.3.99-pre6 linux/arch/sparc64/mm/fault.c

• Lines: 25
• Date: Tue Apr 25 17:52:01 2000
• Orig file: v2.3.99-pre5/linux/arch/sparc64/mm/fault.c
• Orig date: Tue Apr 11 15:09:15 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/sparc64/mm/fault.c linux/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 @@
 	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 @@
 	}
 
 	{
-		int fault = handle_mm_fault(current, vma,
+		int fault = handle_mm_fault(mm, vma,
 					    address, (fault_code & FAULT_CODE_WRITE));
 
 		if (fault < 0)