Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ananth N Mavinakayanahalli 2012-09-05 22:17:04 +00:00 committed by Benjamin Herrenschmidt
parent 0127262c01
commit 28e1e58fb6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/kprobes.h
View File

@ -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

2
arch/powerpc/include/asm/probes.h
View File

@ -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 */

2
arch/powerpc/include/asm/uprobes.h
View File

@ -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)