Commit 28e1e58f authored by Ananth N Mavinakayanahalli's avatar Ananth N Mavinakayanahalli Committed by Benjamin Herrenschmidt

powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t

commit: 8b7b80b9
[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: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0127262c
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
struct pt_regs; struct pt_regs;
struct kprobe; struct kprobe;
typedef opcode_t kprobe_opcode_t; typedef ppc_opcode_t kprobe_opcode_t;
#define MAX_INSN_SIZE 1 #define MAX_INSN_SIZE 1
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
*/ */
#include <linux/types.h> #include <linux/types.h>
typedef u32 opcode_t; typedef u32 ppc_opcode_t;
#define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */ #define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */
/* Trap definitions per ISA */ /* Trap definitions per ISA */
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <asm/probes.h> #include <asm/probes.h>
typedef opcode_t uprobe_opcode_t; typedef ppc_opcode_t uprobe_opcode_t;
#define MAX_UINSN_BYTES 4 #define MAX_UINSN_BYTES 4
#define UPROBE_XOL_SLOT_BYTES (MAX_UINSN_BYTES) #define UPROBE_XOL_SLOT_BYTES (MAX_UINSN_BYTES)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment