arm64: remove unused COMPAT_PSR definitions

Now that users have been migrated to PSR_AA32, kill the unused
COMPAT_PSR definitions.

The only difference we need a definition for is COMPAT_PSR_DIT_BIT,
which differs from PSR_AA32_DIT_BIT.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
index d55237eb89bb588c22644aacb896583cff8a67c8..177b851ca6d997741580e73c89e448f274ac3ba7 100644 (file)
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -66,35 +66,7 @@
 #endif
 
 /* AArch32 CPSR bits, as seen in AArch32 */
-#define COMPAT_PSR_MODE_MASK   0x0000001f
-#define COMPAT_PSR_MODE_USR    0x00000010
-#define COMPAT_PSR_MODE_FIQ    0x00000011
-#define COMPAT_PSR_MODE_IRQ    0x00000012
-#define COMPAT_PSR_MODE_SVC    0x00000013
-#define COMPAT_PSR_MODE_ABT    0x00000017
-#define COMPAT_PSR_MODE_HYP    0x0000001a
-#define COMPAT_PSR_MODE_UND    0x0000001b
-#define COMPAT_PSR_MODE_SYS    0x0000001f
-#define COMPAT_PSR_T_BIT       0x00000020
-#define COMPAT_PSR_F_BIT       0x00000040
-#define COMPAT_PSR_I_BIT       0x00000080
-#define COMPAT_PSR_A_BIT       0x00000100
-#define COMPAT_PSR_E_BIT       0x00000200
 #define COMPAT_PSR_DIT_BIT     0x00200000
-#define COMPAT_PSR_J_BIT       0x01000000
-#define COMPAT_PSR_Q_BIT       0x08000000
-#define COMPAT_PSR_V_BIT       0x10000000
-#define COMPAT_PSR_C_BIT       0x20000000
-#define COMPAT_PSR_Z_BIT       0x40000000
-#define COMPAT_PSR_N_BIT       0x80000000
-#define COMPAT_PSR_IT_MASK     0x0600fc00      /* If-Then execution state mask */
-#define COMPAT_PSR_GE_MASK     0x000f0000
-
-#ifdef CONFIG_CPU_BIG_ENDIAN
-#define COMPAT_PSR_ENDSTATE    COMPAT_PSR_E_BIT
-#else
-#define COMPAT_PSR_ENDSTATE    0
-#endif
 
 /*
  * These are 'magic' values for PTRACE_PEEKUSR that return info about where a