From 144077ead4428732d27553d3fa74f06f71c6438d Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 24 Jun 2011 16:27:09 +1000 Subject: m68k: merge the mmu and non-mmu traps.c files The code for handling traps in the non-mmu case is a subset of the mmu enabled case. Merge the non-mmu traps_no.c code back to a single traps.c. There is actually no code mmu specific here at all, and the processor specific code (for the more complex 68020/68030/68040/68060) is already proplerly conditionaly used. The format of console exception dump is a little different, but I don't think will cause any one problems, it is purely for debug purposes. Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/processor.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/m68k/include') diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index d8ef53ac03f..568facf3027 100644 --- a/arch/m68k/include/asm/processor.h +++ b/arch/m68k/include/asm/processor.h @@ -135,6 +135,12 @@ do { \ wrusp(_usp); \ } while(0) +static inline int handle_kernel_fault(struct pt_regs *regs) +{ + /* Any fault in kernel is fatal on non-mmu */ + return 0; +} + #endif /* Forward declaration, a strange C thing */ -- cgit v1.2.3-70-g09d2