Merge branch 'linus' into perf/kprobes

[linux-2.6-microblaze.git] / kernel / trace / trace_kprobe.c

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 9d46415..7a23c86 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1731,7 +1731,8 @@ NOKPROBE_SYMBOL(kprobe_dispatcher);
 static int
 kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs)
 {
-       struct trace_kprobe *tk = container_of(ri->rp, struct trace_kprobe, rp);
+       struct kretprobe *rp = get_kretprobe(ri);
+       struct trace_kprobe *tk = container_of(rp, struct trace_kprobe, rp);
 
        raw_cpu_inc(*tk->nhit);