diff --git a/[refs] b/[refs]
index 31a3aaae541e..b027fb1886a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df09ce4a15bac7b05356b2f00fbb600c5890b1f3
+refs/heads/master: a94d308513bdb2b926b45c11d7ce7fac6d6ca865
diff --git a/trunk/include/asm-powerpc/siginfo.h b/trunk/include/asm-powerpc/siginfo.h
index 538ea8ef509b..12f1bce037be 100644
--- a/trunk/include/asm-powerpc/siginfo.h
+++ b/trunk/include/asm-powerpc/siginfo.h
@@ -15,4 +15,12 @@
 
 #include <asm-generic/siginfo.h>
 
+/*
+ * SIGTRAP si_codes
+ */
+#define TRAP_BRANCH	(__SI_FAULT|3)	/* process taken branch trap */
+#define TRAP_HWBKPT	(__SI_FAULT|4)	/* hardware breakpoint or watchpoint */
+#undef NSIGTRAP
+#define NSIGTRAP	4
+
 #endif	/* _ASM_POWERPC_SIGINFO_H */
diff --git a/trunk/include/asm-ppc/ptrace.h b/trunk/include/asm-ppc/ptrace.h
index 9d4e4ea530c3..7043c164b537 100644
--- a/trunk/include/asm-ppc/ptrace.h
+++ b/trunk/include/asm-ppc/ptrace.h
@@ -142,4 +142,11 @@ do {									      \
 #define PTRACE_GETEVRREGS	20
 #define PTRACE_SETEVRREGS	21
 
+/*
+ * Get or set a debug register. The first 16 are DABR registers and the
+ * second 16 are IABR registers.
+ */
+#define PTRACE_GET_DEBUGREG	25
+#define PTRACE_SET_DEBUGREG	26
+
 #endif
diff --git a/trunk/include/asm-ppc64/ptrace.h b/trunk/include/asm-ppc64/ptrace.h
index a736000d7cf8..3a55377f1fd3 100644
--- a/trunk/include/asm-ppc64/ptrace.h
+++ b/trunk/include/asm-ppc64/ptrace.h
@@ -189,6 +189,13 @@ extern unsigned long profile_pc(struct pt_regs *regs);
 #define PTRACE_SETEVRREGS       21
 #endif
 
+/*
+ * Get or set a debug register. The first 16 are DABR registers and the
+ * second 16 are IABR registers.
+ */
+#define PTRACE_GET_DEBUGREG	25
+#define PTRACE_SET_DEBUGREG	26
+
 /* Additional PTRACE requests implemented on PowerPC. */
 #define PPC_PTRACE_GETREGS	0x99	/* Get GPRs 0 - 31 */
 #define PPC_PTRACE_SETREGS	0x98	/* Set GPRs 0 - 31 */