oprofile: add op_cpu_buffer_get_data()

[firefly-linux-kernel-4.4.55.git] / drivers / oprofile / buffer_sync.c

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index d969bb13a25281b875e9c4726d7a3fb51ff663ac..f9031d31eeb7eceab4872b2496c8f13d986e1e04 100644 (file)
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -524,6 +524,7 @@ void sync_buffer(int cpu)
 {
        struct mm_struct *mm = NULL;
        struct mm_struct *oldmm;
+       unsigned long val;
        struct task_struct *new;
        unsigned long cookie = 0;
        int in_kernel = 1;
@@ -559,10 +560,11 @@ void sync_buffer(int cpu)
                                        state = sb_sample_start;
                                add_kernel_ctx_switch(flags & IS_KERNEL);
                        }
-                       if (flags & USER_CTX_SWITCH) {
+                       if (flags & USER_CTX_SWITCH
+                           && op_cpu_buffer_get_data(&entry, &val)) {
                                /* userspace context switch */
+                               new = (struct task_struct *)val;
                                oldmm = mm;
-                               new = (struct task_struct *)sample->data[0];
                                release_mm(oldmm);
                                mm = take_tasks_mm(new);
                                if (mm != oldmm)