diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 00:08:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 00:08:12 -0400 |
| commit | ccc712fe6b2acbafe9fc31f765a193e3249ca4a1 (patch) | |
| tree | 9e1a4052a69203baf1e866af4536ca9ceb904fa6 /arch/powerpc/kernel/traps.c | |
| parent | 9c637646dafd82370c284ce7fcc8b4ba2546dfb1 (diff) | |
| parent | c9169f8747bb282cbe518132bf7d49755a00b6c1 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index e4d1713e8aea..9b352bd0a460 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -585,14 +585,14 @@ static void parse_fpe(struct pt_regs *regs) | |||
| 585 | #define INST_MFSPR_PVR_MASK 0xfc1fffff | 585 | #define INST_MFSPR_PVR_MASK 0xfc1fffff |
| 586 | 586 | ||
| 587 | #define INST_DCBA 0x7c0005ec | 587 | #define INST_DCBA 0x7c0005ec |
| 588 | #define INST_DCBA_MASK 0x7c0007fe | 588 | #define INST_DCBA_MASK 0xfc0007fe |
| 589 | 589 | ||
| 590 | #define INST_MCRXR 0x7c000400 | 590 | #define INST_MCRXR 0x7c000400 |
| 591 | #define INST_MCRXR_MASK 0x7c0007fe | 591 | #define INST_MCRXR_MASK 0xfc0007fe |
| 592 | 592 | ||
| 593 | #define INST_STRING 0x7c00042a | 593 | #define INST_STRING 0x7c00042a |
| 594 | #define INST_STRING_MASK 0x7c0007fe | 594 | #define INST_STRING_MASK 0xfc0007fe |
| 595 | #define INST_STRING_GEN_MASK 0x7c00067e | 595 | #define INST_STRING_GEN_MASK 0xfc00067e |
| 596 | #define INST_LSWI 0x7c0004aa | 596 | #define INST_LSWI 0x7c0004aa |
| 597 | #define INST_LSWX 0x7c00042a | 597 | #define INST_LSWX 0x7c00042a |
| 598 | #define INST_STSWI 0x7c0005aa | 598 | #define INST_STSWI 0x7c0005aa |