diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-06-24 16:27:09 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-10-18 14:22:25 +1000 |
| commit | 144077ead4428732d27553d3fa74f06f71c6438d (patch) | |
| tree | 8aba533bcf1f6ceb5971271e8f9de338ddb3e244 /arch/m68k/include/asm | |
| parent | bc4f4ac2f09a0681b4bd10e698e7f0c6e5137ca0 (diff) | |
| download | talos-obmc-linux-144077ead4428732d27553d3fa74f06f71c6438d.tar.gz talos-obmc-linux-144077ead4428732d27553d3fa74f06f71c6438d.zip | |
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 <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm')
| -rw-r--r-- | arch/m68k/include/asm/processor.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index d8ef53ac03f9..568facf30276 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 */ |
