aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorAnanth N Mavinakayanahalli <ananth@in.ibm.com>2006-01-09 23:52:46 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:40 -0500
commit0498b63504f818e5ab39c818cd6f7b41319a1187 (patch)
treed040fd5e2703f9ad601c6949f58ea29e8554154e /include/asm-powerpc
parente597c2984c64609c6e1e1ac803f00f7550705860 (diff)
[PATCH] kprobes: fix build breakage
The following patch (against 2.6.15-rc5-mm3) fixes a kprobes build break due to changes introduced in the kprobe locking in 2.6.15-rc5-mm3. In addition, the patch reverts back the open-coding of kprobe_mutex. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Acked-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/kprobes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/kprobes.h b/include/asm-powerpc/kprobes.h
index 89dee13c2a4c..f466bc804f41 100644
--- a/include/asm-powerpc/kprobes.h
+++ b/include/asm-powerpc/kprobes.h
@@ -33,6 +33,7 @@
33#define __ARCH_WANT_KPROBES_INSN_SLOT 33#define __ARCH_WANT_KPROBES_INSN_SLOT
34 34
35struct pt_regs; 35struct pt_regs;
36struct kprobe;
36 37
37typedef unsigned int kprobe_opcode_t; 38typedef unsigned int kprobe_opcode_t;
38#define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */ 39#define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */
@@ -50,7 +51,7 @@ typedef unsigned int kprobe_opcode_t;
50 51
51#define ARCH_SUPPORTS_KRETPROBES 52#define ARCH_SUPPORTS_KRETPROBES
52void kretprobe_trampoline(void); 53void kretprobe_trampoline(void);
53extern void arch_remove_kprobe(struct kprobe *p, struct semaphore *s); 54extern void arch_remove_kprobe(struct kprobe *p);
54 55
55/* Architecture specific copy of original instruction */ 56/* Architecture specific copy of original instruction */
56struct arch_specific_insn { 57struct arch_specific_insn {