From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Sun, 11 Nov 2012 12:28:37 +0000 (+0100)
Subject: m68k/sun3: Fix instruction faults
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5fec45a20db3656ce36fac24639aac76c6641215;p=linux-beck.git

m68k/sun3: Fix instruction faults

We need to bring in the page where the instruction fault happened.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index 388e5cc89599..cbc624af4494 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -506,7 +506,7 @@ static inline void bus_error030 (struct frame *fp)
 		addr -= 2;
 
 	if (buserr_type & SUN3_BUSERR_INVALID) {
-		if (!mmu_emu_handle_fault (fp->un.fmtb.daddr, 1, 0))
+		if (!mmu_emu_handle_fault(addr, 1, 0))
 			do_page_fault (&fp->ptregs, addr, 0);
        } else {
 #ifdef DEBUG