summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/probes.h
diff options
context:
space:
mode:
authorAnanth N Mavinakayanahalli <ananth@in.ibm.com>2012-09-05 22:17:04 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-09-07 09:48:50 +1000
commit28e1e58fb668e262648fb8ee8a24154633f40507 (patch)
tree6a616228242a2caeca3ceff4f24c97b6f6053ce0 /arch/powerpc/include/asm/probes.h
parent0127262c01f0beb485f917c720d1d95d165dfdbf (diff)
powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t
commit: 8b7b80b9ebb46dd88fbb94e918297295cf312b59 [24/29] powerpc: Uprobes port to powerpc Caused a clash with the fore200e driver: In file included from drivers/atm/fore200e.c:70:0: drivers/atm/fore200e.h:263:3: error: redefinition of typedef 'opcode_t' with different type arch/powerpc/include/asm/probes.h:25:13: note: previous declaration of 'opcode_t' was here Fix the namespace clash by making opcode_t in probes.h to ppc_opcode_t. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/probes.h')
-rw-r--r--arch/powerpc/include/asm/probes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/probes.h b/arch/powerpc/include/asm/probes.h
index 610e0005664..5f1e15b6870 100644
--- a/arch/powerpc/include/asm/probes.h
+++ b/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 */