summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/processor.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 19:08:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 19:08:03 -0700
commitdc113c1f1d4b47af1b1ca701c5a39e24d296c2ac (patch)
tree0bb5ce21bcd41a9443708567edbdca80d9a72397 /arch/m68k/include/asm/processor.h
parent63a93699c6a58795b854ff573542a08367684dae (diff)
parent059718d572e8ad388313b863aff717623bb2552f (diff)
downloadop-kernel-dev-dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac.zip
op-kernel-dev-dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast m68k/atari: ARAnyM - Add support for network access m68k/atari: ARAnyM - Add support for console access m68k/atari: ARAnyM - Add support for block access m68k/atari: Initial ARAnyM support m68k: Kconfig - Remove unneeded "default n" m68k: Makefiles - Change to new flags variables m68k/amiga: Reclaim Chip RAM for PPC exception handlers m68k: Allow all kernel traps to be handled via exception fixups m68k: Use base_trap_init() to initialize vectors m68k: Add helper function handle_kernel_fault()
Diffstat (limited to 'arch/m68k/include/asm/processor.h')
-rw-r--r--arch/m68k/include/asm/processor.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
index 278c69b..f111b02 100644
--- a/arch/m68k/include/asm/processor.h
+++ b/arch/m68k/include/asm/processor.h
@@ -113,6 +113,8 @@ static inline void start_thread(struct pt_regs * regs, unsigned long pc,
wrusp(usp);
}
+extern int handle_kernel_fault(struct pt_regs *regs);
+
#else
/*
OpenPOWER on IntegriCloud