Merge branch 'x86/entry' into ras/core

[linux-2.6-microblaze.git] / arch / powerpc / include / asm / ptrace.h

diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 7c585bd..ac3970f 100644 (file)
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -182,13 +182,13 @@ extern int ptrace_put_reg(struct task_struct *task, int regno,
 
 #ifdef __powerpc64__
 #ifdef CONFIG_PPC_BOOK3S
-#define TRAP_FLAGS_MASK                0
-#define TRAP(regs)             ((regs)->trap)
+#define TRAP_FLAGS_MASK                0x10
+#define TRAP(regs)             ((regs)->trap & ~TRAP_FLAGS_MASK)
 #define FULL_REGS(regs)                true
 #define SET_FULL_REGS(regs)    do { } while (0)
 #else
-#define TRAP_FLAGS_MASK                0x1
-#define TRAP(regs)             ((regs)->trap & ~0x1)
+#define TRAP_FLAGS_MASK                0x11
+#define TRAP(regs)             ((regs)->trap & ~TRAP_FLAGS_MASK)
 #define FULL_REGS(regs)                (((regs)->trap & 1) == 0)
 #define SET_FULL_REGS(regs)    ((regs)->trap |= 1)
 #endif
@@ -202,8 +202,8 @@ 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_FLAGS_MASK                0xF
-#define TRAP(regs)             ((regs)->trap & ~0xF)
+#define TRAP_FLAGS_MASK                0x1F
+#define TRAP(regs)             ((regs)->trap & ~TRAP_FLAGS_MASK)
 #define FULL_REGS(regs)                (((regs)->trap & 1) == 0)
 #define SET_FULL_REGS(regs)    ((regs)->trap |= 1)
 #define IS_CRITICAL_EXC(regs)  (((regs)->trap & 2) != 0)
@@ -222,6 +222,21 @@ static inline void set_trap(struct pt_regs *regs, unsigned long val)
        regs->trap = (regs->trap & TRAP_FLAGS_MASK) | (val & ~TRAP_FLAGS_MASK);
 }
 
+static inline bool trap_is_syscall(struct pt_regs *regs)
+{
+       return TRAP(regs) == 0xc00;
+}
+
+static inline bool trap_norestart(struct pt_regs *regs)
+{
+       return regs->trap & 0x10;
+}
+
+static inline void set_trap_norestart(struct pt_regs *regs)
+{
+       regs->trap |= 0x10;
+}
+
 #define arch_has_single_step() (1)
 #ifndef CONFIG_BOOK3S_601
 #define arch_has_block_step()  (true)