projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
kprobes.c
diff --git
a/arch/x86_64/kernel/kprobes.c
b/arch/x86_64/kernel/kprobes.c
index
ac24156
..
209c8c0
100644
(file)
--- a/
arch/x86_64/kernel/kprobes.c
+++ b/
arch/x86_64/kernel/kprobes.c
@@
-224,7
+224,7
@@
void __kprobes arch_disarm_kprobe(struct kprobe *p)
void __kprobes arch_remove_kprobe(struct kprobe *p)
{
mutex_lock(&kprobe_mutex);
- free_insn_slot(p->ainsn.insn);
+ free_insn_slot(p->ainsn.insn
, 0
);
mutex_unlock(&kprobe_mutex);
}