diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 2bb1cb911783..d8502e377518 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -299,7 +299,7 @@ static inline int check_io_access(struct pt_regs *regs) | |||
| 299 | #ifndef CONFIG_FSL_BOOKE | 299 | #ifndef CONFIG_FSL_BOOKE |
| 300 | #define get_mc_reason(regs) ((regs)->dsisr) | 300 | #define get_mc_reason(regs) ((regs)->dsisr) |
| 301 | #else | 301 | #else |
| 302 | #define get_mc_reason(regs) (mfspr(SPRN_MCSR)) | 302 | #define get_mc_reason(regs) (mfspr(SPRN_MCSR) & MCSR_MASK) |
| 303 | #endif | 303 | #endif |
| 304 | #define REASON_FP ESR_FP | 304 | #define REASON_FP ESR_FP |
| 305 | #define REASON_ILLEGAL (ESR_PIL | ESR_PUO) | 305 | #define REASON_ILLEGAL (ESR_PIL | ESR_PUO) |
| @@ -414,8 +414,6 @@ void machine_check_exception(struct pt_regs *regs) | |||
| 414 | printk("Data Cache Push Parity Error\n"); | 414 | printk("Data Cache Push Parity Error\n"); |
| 415 | if (reason & MCSR_DCPERR) | 415 | if (reason & MCSR_DCPERR) |
| 416 | printk("Data Cache Parity Error\n"); | 416 | printk("Data Cache Parity Error\n"); |
| 417 | if (reason & MCSR_GL_CI) | ||
| 418 | printk("Guarded Load or Cache-Inhibited stwcx.\n"); | ||
| 419 | if (reason & MCSR_BUS_IAERR) | 417 | if (reason & MCSR_BUS_IAERR) |
| 420 | printk("Bus - Instruction Address Error\n"); | 418 | printk("Bus - Instruction Address Error\n"); |
| 421 | if (reason & MCSR_BUS_RAERR) | 419 | if (reason & MCSR_BUS_RAERR) |