patch-2.1.29 linux/arch/sparc/mm/sun4c.c

• Lines: 23
• Date: Wed Mar 5 17:04:30 1997
• Orig file: v2.1.28/linux/arch/sparc/mm/sun4c.c
• Orig date: Mon Dec 30 01:59:58 1996

diff -u --recursive --new-file v2.1.28/linux/arch/sparc/mm/sun4c.c linux/arch/sparc/mm/sun4c.c
@@ -1,4 +1,4 @@
-/* $Id: sun4c.c,v 1.137 1996/12/30 06:16:36 davem Exp $
+/* $Id: sun4c.c,v 1.139 1997/01/31 08:05:59 davem Exp $
  * sun4c.c: Doing in software what should be done in hardware.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
@@ -1878,6 +1878,7 @@
 {
 	if(address >= SUN4C_LOCK_VADDR)
 		return NULL;
+	address = (address >> PAGE_SHIFT) & (SUN4C_PTRS_PER_PTE - 1);
 	if (sun4c_pmd_none(*pmd))
 		panic("sun4c_pmd_none for kernel pmd, can't happen...");
 	if (sun4c_pmd_bad(*pmd)) {
@@ -2007,7 +2008,7 @@
 
 					if(pte_val(*ptep) & _SUN4C_PAGE_PRESENT) {
 #if 1
-						printk("Fixing USER/USER alias [%d:%08lx]\n",
+						printk("Fixing USER/USER alias [%ld:%08lx]\n",
 						       vmaring->vm_mm->context, start);
 #endif
 						sun4c_flush_cache_page(vmaring, start);