Skip to content

Commit

Permalink
powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t
Browse files Browse the repository at this point in the history
commit: 8b7b80b
[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>
  • Loading branch information
Ananth N Mavinakayanahalli authored and Benjamin Herrenschmidt committed Sep 6, 2012
1 parent 0127262 commit 28e1e58
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/kprobes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/probes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/uprobes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 28e1e58

Please sign in to comment.