summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorShaohui Xie <b21989@freescale.com>2010-11-18 07:57:32 +0100
committerKumar Gala <galak@kernel.crashing.org>2011-05-20 15:46:57 +0200
commitcce1f106c64dc1d19d5e9406320fde18dfc662df (patch)
tree0fe38cf975577cb22de977ab36dc1cde82d80125 /arch/powerpc/include
parentpowerpc/fsl_lbc: Add workaround for ELBC-A001 erratum (diff)
downloadlinux-cce1f106c64dc1d19d5e9406320fde18dfc662df.tar.xz
linux-cce1f106c64dc1d19d5e9406320fde18dfc662df.zip
powerpc/fsl_rio: move machine_check handler
Add support for machine_check support into machine_check_e500 and machine_check_e500mc. Signed-off-by: Shaohui Xie <b21989@freescale.com> Cc: Li Yang <leoli@freescale.com> Cc: Roy Zang <tie-fei.zang@freescale.com> Cc: Alexandre Bounine <alexandre.bounine@idt.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/rio.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/rio.h b/arch/powerpc/include/asm/rio.h
index 0018bf80cb25..d902abd33995 100644
--- a/arch/powerpc/include/asm/rio.h
+++ b/arch/powerpc/include/asm/rio.h
@@ -14,5 +14,10 @@
#define ASM_PPC_RIO_H
extern void platform_rio_init(void);
+#ifdef CONFIG_RAPIDIO
+extern int fsl_rio_mcheck_exception(struct pt_regs *);
+#else
+static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; }
+#endif
#endif /* ASM_PPC_RIO_H */