aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/traps.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-12-05 12:01:28 -0500
committerDavid Howells <dhowells@warthog.cambridge.redhat.com>2006-12-05 12:01:28 -0500
commit9db73724453a9350e1c22dbe732d427e2939a5c9 (patch)
tree15e3ead6413ae97398a54292acc199bee0864d42 /arch/ppc/kernel/traps.c
parent4c1ac1b49122b805adfa4efc620592f68dccf5db (diff)
parente62438630ca37539c8cc1553710bbfaa3cf960a7 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/ata/libata-scsi.c include/linux/libata.h Futher merge of Linus's head and compilation fixups. Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/ppc/kernel/traps.c')
-rw-r--r--arch/ppc/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index 9661a91183b3..2f835b9e95e4 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -316,7 +316,7 @@ void machine_check_exception(struct pt_regs *regs)
316 if (reason & MCSR_BUS_RBERR) 316 if (reason & MCSR_BUS_RBERR)
317 printk("Bus - Read Data Bus Error\n"); 317 printk("Bus - Read Data Bus Error\n");
318 if (reason & MCSR_BUS_WBERR) 318 if (reason & MCSR_BUS_WBERR)
319 printk("Bus - Read Data Bus Error\n"); 319 printk("Bus - Write Data Bus Error\n");
320 if (reason & MCSR_BUS_IPERR) 320 if (reason & MCSR_BUS_IPERR)
321 printk("Bus - Instruction Parity Error\n"); 321 printk("Bus - Instruction Parity Error\n");
322 if (reason & MCSR_BUS_RPERR) 322 if (reason & MCSR_BUS_RPERR)