diff --git a/[refs] b/[refs]
index a4efebae8695..0574786c7e99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0127262c01f0beb485f917c720d1d95d165dfdbf
+refs/heads/master: 28e1e58fb668e262648fb8ee8a24154633f40507
diff --git a/trunk/arch/powerpc/include/asm/kprobes.h b/trunk/arch/powerpc/include/asm/kprobes.h
index dc581976c6dc..7b6feab6fd26 100644
--- a/trunk/arch/powerpc/include/asm/kprobes.h
+++ b/trunk/arch/powerpc/include/asm/kprobes.h
@@ -36,7 +36,7 @@
 struct pt_regs;
 struct kprobe;
 
-typedef opcode_t kprobe_opcode_t;
+typedef ppc_opcode_t kprobe_opcode_t;
 #define MAX_INSN_SIZE 1
 
 #ifdef CONFIG_PPC64
diff --git a/trunk/arch/powerpc/include/asm/probes.h b/trunk/arch/powerpc/include/asm/probes.h
index 610e00056640..5f1e15b68704 100644
--- a/trunk/arch/powerpc/include/asm/probes.h
+++ b/trunk/arch/powerpc/include/asm/probes.h
@@ -22,7 +22,7 @@
  */
 #include <linux/types.h>
 
-typedef u32 opcode_t;
+typedef u32 ppc_opcode_t;
 #define BREAKPOINT_INSTRUCTION	0x7fe00008	/* trap */
 
 /* Trap definitions per ISA */
diff --git a/trunk/arch/powerpc/include/asm/uprobes.h b/trunk/arch/powerpc/include/asm/uprobes.h
index 13ba5077b59b..b532060d0916 100644
--- a/trunk/arch/powerpc/include/asm/uprobes.h
+++ b/trunk/arch/powerpc/include/asm/uprobes.h
@@ -25,7 +25,7 @@
 #include <linux/notifier.h>
 #include <asm/probes.h>
 
-typedef opcode_t uprobe_opcode_t;
+typedef ppc_opcode_t uprobe_opcode_t;
 
 #define MAX_UINSN_BYTES		4
 #define UPROBE_XOL_SLOT_BYTES	(MAX_UINSN_BYTES)