diff options
| author | Ananth N Mavinakayanahalli <ananth@in.ibm.com> | 2012-09-05 22:17:04 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-07 09:48:50 +1000 |
| commit | 28e1e58fb668e262648fb8ee8a24154633f40507 (patch) | |
| tree | 6a616228242a2caeca3ceff4f24c97b6f6053ce0 | |
| parent | 0127262c01f0beb485f917c720d1d95d165dfdbf (diff) | |
| download | linux-stable-28e1e58fb668e262648fb8ee8a24154633f40507.tar.gz linux-stable-28e1e58fb668e262648fb8ee8a24154633f40507.tar.bz2 linux-stable-28e1e58fb668e262648fb8ee8a24154633f40507.zip | |
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>
| -rw-r--r-- | arch/powerpc/include/asm/kprobes.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/probes.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/uprobes.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h index dc581976c6dc..7b6feab6fd26 100644 --- a/arch/powerpc/include/asm/kprobes.h +++ b/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/arch/powerpc/include/asm/probes.h b/arch/powerpc/include/asm/probes.h index 610e00056640..5f1e15b68704 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 */ diff --git a/arch/powerpc/include/asm/uprobes.h b/arch/powerpc/include/asm/uprobes.h index 13ba5077b59b..b532060d0916 100644 --- a/arch/powerpc/include/asm/uprobes.h +++ b/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) |