diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-03-21 16:03:36 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-05-22 16:23:58 -0400 |
| commit | 0b43f034345bc5403ea71450ea16b3dc497d14a3 (patch) | |
| tree | 1e33944ad86f79ff2b252ed1257ece0eca5c1613 | |
| parent | 447ea24c4051c7c1833be3495046399cd8064400 (diff) | |
Revert "kprobes: adjust "fix a memory leak in function pre_handler_kretprobe()""
This reverts commit b8a0040ef7112439ad2efac6f1a79aa842b5924f.
As pointed out by John Kacur, the patch breaks 3.0-rt.
Because rt pulls in 7b8d0e5, the above fix which comes from v3.0.24
should not be applied. kretprobe is a raw_spinlock_t for real-time.
Before the revert we get the following compile errors
kernel/kprobes.c:1664: warning: passing argument 1 of 'rt_spin_lock' from incompatible pointer type
kernel/kprobes.c:1666: warning: passing argument 1 of 'rt_spin_unlock' from incompatible pointer type
Signed-off-by: John Kacur <jkacur@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/kprobes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index a7dcf069d87b..9cdbf26e50e3 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1661,9 +1661,9 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p, ri->task = current; if (rp->entry_handler && rp->entry_handler(ri, regs)) { - spin_lock_irqsave(&rp->lock, flags); + raw_spin_lock_irqsave(&rp->lock, flags); hlist_add_head(&ri->hlist, &rp->free_instances); - spin_unlock_irqrestore(&rp->lock, flags); + raw_spin_unlock_irqrestore(&rp->lock, flags); return 0; } |