From 82efddbc545fe0375268aea1ce87e4562f9f5f77 Mon Sep 17 00:00:00 2001 From: Ananth N Mavinakayanahalli Date: Wed, 5 Sep 2012 22:17:04 +0000 Subject: [PATCH] --- yaml --- r: 330263 b: refs/heads/master c: 28e1e58fb668e262648fb8ee8a24154633f40507 h: refs/heads/master i: 330261: 85efc70d1528726aea5c20b4fdf2fc6d450a32f3 330259: fba8a09b8c3d974fda5cd8909c965f70aae3956f 330255: e4e29f13ce3abafa8b1dbc9b67fe09dcdbe983ed v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/kprobes.h | 2 +- trunk/arch/powerpc/include/asm/probes.h | 2 +- trunk/arch/powerpc/include/asm/uprobes.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a4efebae8695..0574786c7e99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0127262c01f0beb485f917c720d1d95d165dfdbf +refs/heads/master: 28e1e58fb668e262648fb8ee8a24154633f40507 diff --git a/trunk/arch/powerpc/include/asm/kprobes.h b/trunk/arch/powerpc/include/asm/kprobes.h index dc581976c6dc..7b6feab6fd26 100644 --- a/trunk/arch/powerpc/include/asm/kprobes.h +++ b/trunk/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/trunk/arch/powerpc/include/asm/probes.h b/trunk/arch/powerpc/include/asm/probes.h index 610e00056640..5f1e15b68704 100644 --- a/trunk/arch/powerpc/include/asm/probes.h +++ b/trunk/arch/powerpc/include/asm/probes.h @@ -22,7 +22,7 @@ */ #include -typedef u32 opcode_t; +typedef u32 ppc_opcode_t; #define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */ /* Trap definitions per ISA */ diff --git a/trunk/arch/powerpc/include/asm/uprobes.h b/trunk/arch/powerpc/include/asm/uprobes.h index 13ba5077b59b..b532060d0916 100644 --- a/trunk/arch/powerpc/include/asm/uprobes.h +++ b/trunk/arch/powerpc/include/asm/uprobes.h @@ -25,7 +25,7 @@ #include #include -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)