Skip to contentSkip to conversation

SUN3: Fix intruction faults

PATCH In review Thomas Bogendoerfer 2 participants 2 messages Nov 11, 2012 – Nov 14, 2012 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SUN3: Fix intruction faults

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

---

 arch/m68k/kernel/traps.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/m68k/kernel/traps.c +1 -1
index 388e5cc..cbc624a 100644
@@ -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
#1 lore raw
Quoted 3 lines · Thomas Bogendoerfer

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

Thanks, will queue for 3.8.

Quoted 10 lines

---

 arch/m68k/kernel/traps.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/m68k/kernel/traps.c +0 -0
index 388e5cc..cbc624a 100644

arch/m68k/kernel/traps.c static inline void bus_error030 (struct frame *fp) · line 512

Quoted 8 lines
arch/m68k/kernel/traps.c +1 -1
@@ -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

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds