diff options
| author | Ananth N Mavinakayanahalli <ananth@in.ibm.com> | 2006-01-09 20:52:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:40 -0800 |
| commit | 0498b63504f818e5ab39c818cd6f7b41319a1187 (patch) | |
| tree | d040fd5e2703f9ad601c6949f58ea29e8554154e /arch | |
| parent | e597c2984c64609c6e1e1ac803f00f7550705860 (diff) | |
| download | linux-0498b63504f818e5ab39c818cd6f7b41319a1187.tar.bz2 | |
[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')
| -rw-r--r-- | arch/powerpc/kernel/kprobes.c | 6 | ||||
| -rw-r--r-- | arch/x86_64/kernel/kprobes.c | 6 |
2 files changed, 6 insertions, 6 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) (unsigned long) p->addr + sizeof(kprobe_opcode_t)); } -void __kprobes arch_remove_kprobe(struct kprobe *p, struct semaphore *s) +void __kprobes arch_remove_kprobe(struct kprobe *p) { - down(s); + down(&kprobe_mutex); free_insn_slot(p->ainsn.insn); - up(s); + up(&kprobe_mutex); } static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs) diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c index 61a6a9369cbd..b7dc1f816d13 100644 --- a/arch/x86_64/kernel/kprobes.c +++ b/arch/x86_64/kernel/kprobes.c @@ -220,11 +220,11 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p) (unsigned long) p->addr + sizeof(kprobe_opcode_t)); } -void __kprobes arch_remove_kprobe(struct kprobe *p, struct semaphore *s) +void __kprobes arch_remove_kprobe(struct kprobe *p) { - down(s); + down(&kprobe_mutex); free_insn_slot(p->ainsn.insn); - up(s); + up(&kprobe_mutex); } static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb) |