Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[cascardo/linux.git] / kernel / trace / trace_uprobe.c

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 7915142..c534854 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -1131,7 +1131,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
        if (hlist_empty(head))
                goto out;
 
-       entry = perf_trace_buf_prepare(size, call->event.type, NULL, &rctx);
+       entry = perf_trace_buf_alloc(size, NULL, &rctx);
        if (!entry)
                goto out;
 
@@ -1152,7 +1152,8 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
                memset(data + len, 0, size - esize - len);
        }
 
-       perf_trace_buf_submit(entry, size, rctx, 0, 1, regs, head, NULL);
+       perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
+                             head, NULL);
  out:
        preempt_enable();
 }