powerpc/traps: Use SRR1 defines for program check reasons

Currently we open code the reason codes for program checks. Instead use
the existing SRR1 defines.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 73be2f71dbbb60893d81cc788536d9bd3c0b69ea..c0600e9e0ff5e80d55405c9f08312e1ef6688800 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -724,6 +724,7 @@
                                          * may not be recoverable */
 #define          SRR1_WS_DEEPER        0x00020000 /* Some resources not maintained */
 #define          SRR1_WS_DEEP          0x00010000 /* All resources maintained */
+#define   SRR1_PROGTM          0x00200000 /* TM Bad Thing */
 #define   SRR1_PROGFPE         0x00100000 /* Floating Point Enabled */
 #define   SRR1_PROGILL         0x00080000 /* Illegal instruction */
 #define   SRR1_PROGPRIV                0x00040000 /* Privileged instruction */

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index a891c277040bac0e42a99e8f7d78f9de5ee77c39..c567d706a7ed346e3b586d5a18fa74d1fad673bf 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -379,11 +379,11 @@ static inline int check_io_access(struct pt_regs *regs)
 /* On non-4xx, the reason for the machine check or program
    exception is in the MSR. */
 #define get_reason(regs)       ((regs)->msr)
-#define REASON_TM              0x200000
-#define REASON_FP              0x100000
-#define REASON_ILLEGAL         0x80000
-#define REASON_PRIVILEGED      0x40000
-#define REASON_TRAP            0x20000
+#define REASON_TM              SRR1_PROGTM
+#define REASON_FP              SRR1_PROGFPE
+#define REASON_ILLEGAL         SRR1_PROGILL
+#define REASON_PRIVILEGED      SRR1_PROGPRIV
+#define REASON_TRAP            SRR1_PROGTRAP
 
 #define single_stepping(regs)  ((regs)->msr & MSR_SE)
 #define clear_single_step(regs)        ((regs)->msr &= ~MSR_SE)