diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-20 22:43:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-20 22:43:18 -0700 |
| commit | 2046219364a40bcb13482ff68eb6ccec13405633 (patch) | |
| tree | 5f4f951da5a0326318cd1abcd535ea40dc90c3b7 /arch/powerpc/kernel | |
| parent | 0c5564bd91ad237212871d52deaf79ffe06bcc64 (diff) | |
| parent | 0af666fa6cf4bc639fb6170600b5fb0d8b6504b9 (diff) | |
Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
* 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] Fix 8xx compile failure
[POWERPC] Fix FSL BookE machine check reporting
[POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL boards
[POWERPC] Add interrupt resource for RTC CMOS driver
Diffstat (limited to 'arch/powerpc/kernel')
| -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 2bb1cb91178..d8502e37751 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) #ifndef CONFIG_FSL_BOOKE #define get_mc_reason(regs) ((regs)->dsisr) #else -#define get_mc_reason(regs) (mfspr(SPRN_MCSR)) +#define get_mc_reason(regs) (mfspr(SPRN_MCSR) & MCSR_MASK) #endif #define REASON_FP ESR_FP #define REASON_ILLEGAL (ESR_PIL | ESR_PUO) @@ -414,8 +414,6 @@ void machine_check_exception(struct pt_regs *regs) printk("Data Cache Push Parity Error\n"); if (reason & MCSR_DCPERR) printk("Data Cache Parity Error\n"); - if (reason & MCSR_GL_CI) - printk("Guarded Load or Cache-Inhibited stwcx.\n"); if (reason & MCSR_BUS_IAERR) printk("Bus - Instruction Address Error\n"); if (reason & MCSR_BUS_RAERR) |