git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
kprobes.c
diff --git
a/arch/arm/kernel/kprobes.c
b/arch/arm/kernel/kprobes.c
index 3f9abe0e9aff7e124fd399ce4fd9c4a47380c044..f692efddd4497b0cc505f0eb9a3a526c922489a2 100644
(file)
--- a/
arch/arm/kernel/kprobes.c
+++ b/
arch/arm/kernel/kprobes.c
@@
-92,9
+92,7
@@
void __kprobes arch_disarm_kprobe(struct kprobe *p)
void __kprobes arch_remove_kprobe(struct kprobe *p)
{
if (p->ainsn.insn) {
- mutex_lock(&kprobe_mutex);
free_insn_slot(p->ainsn.insn, 0);
- mutex_unlock(&kprobe_mutex);
p->ainsn.insn = NULL;
}
}