Remove the kprobes mutex from kprobes.h, since it does not belong there. Also
remove all use of this mutex in the architecture specific code, replacing it by
a proper mutex lock/unlock in the architecture agnostic code.

Changelog :
- remove unnecessary kprobe_mutex around arch_remove_kprobe()

Signed-off-by: Mathieu Desnoyers
Acked-by: Ananth N Mavinakayanahalli
CC: anil.s.keshavamurthy@intel.com
CC: davem@davemloft.net
---
arch/ia64/kernel/kprobes.c | 2 --
arch/powerpc/kernel/kprobes.c | 2 --
arch/s390/kernel/kprobes.c | 2 --
arch/x86/kernel/kprobes.c | 2 --
include/linux/kprobes.h | 2 --
kernel/kprobes.c | 2 ++
6 files changed, 2 insertions(+), 10 deletions(-)

Index: linux-2.6-lttng.mm/include/linux/kprobes.h
================================================== =================
--- linux-2.6-lttng.mm.orig/include/linux/kprobes.h 2008-04-09 10:43:10.000000000 -0400
+++ linux-2.6-lttng.mm/include/linux/kprobes.h 2008-04-09 10:43:38.000000000 -0400
@@ -35,7 +35,6 @@
#include
#include
#include
-#include

#ifdef CONFIG_KPROBES
#include
@@ -202,7 +201,6 @@ static inline int init_test_probes(void)
#endif /* CONFIG_KPROBES_SANITY_TEST */

extern spinlock_t kretprobe_lock;
-extern struct mutex kprobe_mutex;
extern int arch_prepare_kprobe(struct kprobe *p);
extern void arch_arm_kprobe(struct kprobe *p);
extern void arch_disarm_kprobe(struct kprobe *p);
Index: linux-2.6-lttng.mm/arch/x86/kernel/kprobes.c
================================================== =================
--- linux-2.6-lttng.mm.orig/arch/x86/kernel/kprobes.c 2008-04-09 10:43:10.000000000 -0400
+++ linux-2.6-lttng.mm/arch/x86/kernel/kprobes.c 2008-04-09 10:43:38.000000000 -0400
@@ -376,9 +376,7 @@ void __kprobes arch_disarm_kprobe(struct

void __kprobes arch_remove_kprobe(struct kprobe *p)
{
- mutex_lock(&kprobe_mutex);
free_insn_slot(p->ainsn.insn, (p->ainsn.boostable == 1));
- mutex_unlock(&kprobe_mutex);
}

static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)
Index: linux-2.6-lttng.mm/arch/ia64/kernel/kprobes.c
================================================== =================
--- linux-2.6-lttng.mm.orig/arch/ia64/kernel/kprobes.c 2008-04-09 10:43:10.000000000 -0400
+++ linux-2.6-lttng.mm/arch/ia64/kernel/kprobes.c 2008-04-09 10:43:38.000000000 -0400
@@ -672,9 +672,7 @@ void __kprobes arch_disarm_kprobe(struct

void __kprobes arch_remove_kprobe(struct kprobe *p)
{
- mutex_lock(&kprobe_mutex);
free_insn_slot(p->ainsn.insn, p->ainsn.inst_flag & INST_FLAG_BOOSTABLE);
- mutex_unlock(&kprobe_mutex);
}
/*
* We are resuming execution after a single step fault, so the pt_regs
Index: linux-2.6-lttng.mm/arch/powerpc/kernel/kprobes.c
================================================== =================
--- linux-2.6-lttng.mm.orig/arch/powerpc/kernel/kprobes.c 2008-04-09 10:43:10.000000000 -0400
+++ linux-2.6-lttng.mm/arch/powerpc/kernel/kprobes.c 2008-04-09 10:43:38.000000000 -0400
@@ -88,9 +88,7 @@ void __kprobes arch_disarm_kprobe(struct

void __kprobes arch_remove_kprobe(struct kprobe *p)
{
- mutex_lock(&kprobe_mutex);
free_insn_slot(p->ainsn.insn, 0);
- mutex_unlock(&kprobe_mutex);
}

static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
Index: linux-2.6-lttng.mm/arch/s390/kernel/kprobes.c
================================================== =================
--- linux-2.6-lttng.mm.orig/arch/s390/kernel/kprobes.c 2008-04-09 10:43:10.000000000 -0400
+++ linux-2.6-lttng.mm/arch/s390/kernel/kprobes.c 2008-04-09 10:43:38.000000000 -0400
@@ -220,9 +220,7 @@ void __kprobes arch_disarm_kprobe(struct

void __kprobes arch_remove_kprobe(struct kprobe *p)
{
- mutex_lock(&kprobe_mutex);
free_insn_slot(p->ainsn.insn, 0);
- mutex_unlock(&kprobe_mutex);
}

static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/