aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/kprobes.c
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 /arch/powerpc/kernel/kprobes.c
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 'arch/powerpc/kernel/kprobes.c')
-rw-r--r--arch/powerpc/kernel/kprobes.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 93444e32fccd..27b0c40601fb 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -80,11 +80,11 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
80 (unsigned long) p->addr + sizeof(kprobe_opcode_t)); 80 (unsigned long) p->addr + sizeof(kprobe_opcode_t));
81} 81}
82 82
83void __kprobes arch_remove_kprobe(struct kprobe *p, struct semaphore *s) 83void __kprobes arch_remove_kprobe(struct kprobe *p)
84{ 84{
85 down(s); 85 down(&kprobe_mutex);
86 free_insn_slot(p->ainsn.insn); 86 free_insn_slot(p->ainsn.insn);
87 up(s); 87 up(&kprobe_mutex);
88} 88}
89 89
90static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs) 90static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)