patch-2.3.43 linux/arch/arm/kernel/traps.c

• Lines: 23
• Date: Sun Feb 6 17:45:25 2000
• Orig file: v2.3.42/linux/arch/arm/kernel/traps.c
• Orig date: Fri Jan 21 18:19:15 2000

diff -u --recursive --new-file v2.3.42/linux/arch/arm/kernel/traps.c linux/arch/arm/kernel/traps.c
@@ -370,7 +370,7 @@
 asmlinkage void
 baddataabort(int code, unsigned long instr, struct pt_regs *regs)
 {
-	unsigned long phys, addr = instruction_pointer(regs);
+	unsigned long addr = instruction_pointer(regs);
 
 #ifdef CONFIG_DEBUG_ERRORS
 	dump_instr(addr, 1);
@@ -383,11 +383,8 @@
 			pmd_t *pmd;
 			pmd = pmd_offset (pgd, addr);
 			printk (", *pmd = %08lx", pmd_val (*pmd));
-			if (!pmd_none (*pmd)) {
-				unsigned long ptr = pte_page(*pte_offset(pmd, addr));
-				printk (", *pte = %08lx", pte_val (*pte_offset (pmd, addr)));
-				phys = ptr + (addr & 0x7fff);
-			}
+			if (!pmd_none (*pmd))
+				printk (", *pte = %08lx", pte_val(*pte_offset (pmd, addr)));
 		}
 		printk ("\n");
 	}