diff options
| author |   Christophe Leroy <christophe.leroy@c-s.fr> | 2017-08-08 13:58:42 +0200 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2017-08-10 23:32:02 +1000 |
| commit | f70b1e8d17ce93fc963936aee144f54a4530172f (patch) | |
| tree | 24797946a235e67dfd9b1da2ce66564c0c326c0f /arch/powerpc/kernel/traps.c | |
| parent | powerpc/8xx: Simplify CONFIG_8xx checks in Makefile (diff) | |
| download | linux-dev-f70b1e8d17ce93fc963936aee144f54a4530172f.tar.xz linux-dev-f70b1e8d17ce93fc963936aee144f54a4530172f.zip | |
powerpc/8xx: Move 8xx machine check handlers into platforms/8xx
In the same spirit as what was done for 4xx and 44x, move
the 8xx machine check into platforms/8xx
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index c567d706a7ed..ce10a3cc860f 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -560,31 +560,6 @@ int machine_check_e200(struct pt_regs *regs) return 0; } -#elif defined(CONFIG_PPC_8xx) -int machine_check_8xx(struct pt_regs *regs) -{ - unsigned long reason = regs->msr; - - pr_err("Machine check in kernel mode.\n"); - pr_err("Caused by (from SRR1=%lx): ", reason); - if (reason & 0x40000000) - pr_err("Fetch error at address %lx\n", regs->nip); - else - pr_err("Data access error at address %lx\n", regs->dar); - -#ifdef CONFIG_PCI - /* the qspan pci read routines can cause machine checks -- Cort - * - * yuck !!! that totally needs to go away ! There are better ways - * to deal with that than having a wart in the mcheck handler. - * -- BenH - */ - bad_page_fault(regs, regs->dar, SIGBUS); - return 1; -#else - return 0; -#endif -} #elif defined(CONFIG_PPC32) int machine_check_generic(struct pt_regs *regs) { |