Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[pandora-kernel.git] / kernel / trace / trace_kprobe.c

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 9a082bb..faf7cef 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1338,9 +1338,9 @@ static __kprobes void kprobe_perf_func(struct kprobe *kp,
        struct trace_probe *tp = container_of(kp, struct trace_probe, rp.kp);
        struct ftrace_event_call *call = &tp->call;
        struct kprobe_trace_entry_head *entry;
        struct trace_probe *tp = container_of(kp, struct trace_probe, rp.kp);
        struct ftrace_event_call *call = &tp->call;
        struct kprobe_trace_entry_head *entry;

+       struct hlist_head *head;

        u8 *data;
        int size, __size, i;
        u8 *data;
        int size, __size, i;

-       unsigned long irq_flags;

        int rctx;
 
        __size = sizeof(*entry) + tp->size;
        int rctx;
 
        __size = sizeof(*entry) + tp->size;


@@ -1350,8 +1350,7 @@ static __kprobes void kprobe_perf_func(struct kprobe *kp,
                     "profile buffer not large enough"))
                return;
 
                     "profile buffer not large enough"))
                return;
 

-       entry = perf_trace_buf_prepare(size, call->event.type,
-                                      &rctx, &irq_flags);
+       entry = perf_trace_buf_prepare(size, call->event.type, regs, &rctx);

        if (!entry)
                return;
 
        if (!entry)
                return;
 


@@ -1360,7 +1359,8 @@ static __kprobes void kprobe_perf_func(struct kprobe *kp,
        for (i = 0; i < tp->nr_args; i++)
                call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
 
        for (i = 0; i < tp->nr_args; i++)
                call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
 

-       perf_trace_buf_submit(entry, size, rctx, entry->ip, 1, irq_flags, regs);
+       head = per_cpu_ptr(call->perf_events, smp_processor_id());
+       perf_trace_buf_submit(entry, size, rctx, entry->ip, 1, regs, head);

 }
 
 /* Kretprobe profile handler */
 }
 
 /* Kretprobe profile handler */


@@ -1370,9 +1370,9 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri,
        struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp);
        struct ftrace_event_call *call = &tp->call;
        struct kretprobe_trace_entry_head *entry;
        struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp);
        struct ftrace_event_call *call = &tp->call;
        struct kretprobe_trace_entry_head *entry;

+       struct hlist_head *head;

        u8 *data;
        int size, __size, i;
        u8 *data;
        int size, __size, i;

-       unsigned long irq_flags;

        int rctx;
 
        __size = sizeof(*entry) + tp->size;
        int rctx;
 
        __size = sizeof(*entry) + tp->size;


@@ -1382,8 +1382,7 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri,
                     "profile buffer not large enough"))
                return;
 
                     "profile buffer not large enough"))
                return;
 

-       entry = perf_trace_buf_prepare(size, call->event.type,
-                                      &rctx, &irq_flags);
+       entry = perf_trace_buf_prepare(size, call->event.type, regs, &rctx);

        if (!entry)
                return;
 
        if (!entry)
                return;
 


@@ -1393,8 +1392,8 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri,
        for (i = 0; i < tp->nr_args; i++)
                call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
 
        for (i = 0; i < tp->nr_args; i++)
                call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
 

-       perf_trace_buf_submit(entry, size, rctx, entry->ret_ip, 1,
-                              irq_flags, regs);
+       head = per_cpu_ptr(call->perf_events, smp_processor_id());
+       perf_trace_buf_submit(entry, size, rctx, entry->ret_ip, 1, regs, head);

 }
 
 static int probe_perf_enable(struct ftrace_event_call *call)
 }
 
 static int probe_perf_enable(struct ftrace_event_call *call)