diff options
| author | Greg Kroah-Hartman | 2006-08-24 06:08:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2006-08-24 06:08:12 +0200 |
| commit | ccc712fe6b2acbafe9fc31f765a193e3249ca4a1 (patch) | |
| tree | 9e1a4052a69203baf1e866af4536ca9ceb904fa6 /arch/powerpc/kernel/traps.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | [POWERPC] hugepage BUG fix (diff) | |
| download | kernel-qcow2-linux-ccc712fe6b2acbafe9fc31f765a193e3249ca4a1.tar.gz kernel-qcow2-linux-ccc712fe6b2acbafe9fc31f765a193e3249ca4a1.tar.xz kernel-qcow2-linux-ccc712fe6b2acbafe9fc31f765a193e3249ca4a1.zip | |
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) #define INST_MFSPR_PVR_MASK 0xfc1fffff #define INST_DCBA 0x7c0005ec -#define INST_DCBA_MASK 0x7c0007fe +#define INST_DCBA_MASK 0xfc0007fe #define INST_MCRXR 0x7c000400 -#define INST_MCRXR_MASK 0x7c0007fe +#define INST_MCRXR_MASK 0xfc0007fe #define INST_STRING 0x7c00042a -#define INST_STRING_MASK 0x7c0007fe -#define INST_STRING_GEN_MASK 0x7c00067e +#define INST_STRING_MASK 0xfc0007fe +#define INST_STRING_GEN_MASK 0xfc00067e #define INST_LSWI 0x7c0004aa #define INST_LSWX 0x7c00042a #define INST_STSWI 0x7c0005aa |