[PATCH v2 1/4] powerpc/64s: Always has full regs, so remove remnant checks

[Michael Ellerman]

From: Nicholas Piggin <npig...@gmail.com>

Signed-off-by: Nicholas Piggin <npig...@gmail.com>
Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
---
 arch/powerpc/include/asm/ptrace.h | 23 ++++++++++++++++-------
 arch/powerpc/kernel/process.c     |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

v2: Unchanged.

diff --git a/arch/powerpc/include/asm/ptrace.h 
b/arch/powerpc/include/asm/ptrace.h
index e0195e6b892b..89f31d5a8062 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -179,6 +179,20 @@ extern int ptrace_put_reg(struct task_struct *task, int 
regno,
 
 #define current_pt_regs() \
        ((struct pt_regs *)((unsigned long)task_stack_page(current) + 
THREAD_SIZE) - 1)
+
+#ifdef __powerpc64__
+#ifdef CONFIG_PPC_BOOK3S
+#define TRAP(regs)             ((regs)->trap)
+#define FULL_REGS(regs)                true
+#define SET_FULL_REGS(regs)    do { } while (0)
+#else
+#define TRAP(regs)             ((regs)->trap & ~0x1)
+#define FULL_REGS(regs)                (((regs)->trap & 1) == 0)
+#define SET_FULL_REGS(regs)    ((regs)->trap |= 1)
+#endif
+#define CHECK_FULL_REGS(regs)  BUG_ON(!FULL_REGS(regs))
+#define NV_REG_POISON          0xdeadbeefdeadbeefUL
+#else
 /*
  * We use the least-significant bit of the trap field to indicate
  * whether we have saved the full set of registers, or only a
@@ -186,17 +200,12 @@ extern int ptrace_put_reg(struct task_struct *task, int 
regno,
  * On 4xx we use the next bit to indicate whether the exception
  * is a critical exception (1 means it is).
  */
+#define TRAP(regs)             ((regs)->trap & ~0xF)
 #define FULL_REGS(regs)                (((regs)->trap & 1) == 0)
-#ifndef __powerpc64__
+#define SET_FULL_REGS(regs)    ((regs)->trap |= 1)
 #define IS_CRITICAL_EXC(regs)  (((regs)->trap & 2) != 0)
 #define IS_MCHECK_EXC(regs)    (((regs)->trap & 4) != 0)
 #define IS_DEBUG_EXC(regs)     (((regs)->trap & 8) != 0)
-#endif /* ! __powerpc64__ */
-#define TRAP(regs)             ((regs)->trap & ~0xF)
-#ifdef __powerpc64__
-#define NV_REG_POISON          0xdeadbeefdeadbeefUL
-#define CHECK_FULL_REGS(regs)  BUG_ON(regs->trap & 1)
-#else
 #define NV_REG_POISON          0xdeadbeef
 #define CHECK_FULL_REGS(regs)                                                \
 do {                                                                         \
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 8479c762aef2..8af3583546b7 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1720,7 +1720,7 @@ void start_thread(struct pt_regs *regs, unsigned long 
start, unsigned long sp)
         * FULL_REGS(regs) return true.  This is necessary to allow
         * ptrace to examine the thread immediately after exec.
         */
-       regs->trap &= ~1UL;
+       SET_FULL_REGS(regs);
 
 #ifdef CONFIG_PPC32
        regs->mq = 0;
-- 
2.25.1