oprofile: modify op_cpu_buffer_read_entry()

[linux-2.6-omap-h63xx.git] / drivers / oprofile / cpu_buffer.c

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 934ff159e70ebb8c7b63066cb654a7c2419362b2..400f7fcffdbea4e3622cbce8472ddd5ce2491881 100644 (file)
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -182,20 +182,28 @@ int op_cpu_buffer_write_commit(struct op_entry *entry)
                                         entry->irq_flags);
 }
 
-struct op_sample *op_cpu_buffer_read_entry(int cpu)
+struct op_sample *op_cpu_buffer_read_entry(struct op_entry *entry, int cpu)
 {
        struct ring_buffer_event *e;
        e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL);
        if (e)
-               return ring_buffer_event_data(e);
+               goto event;
        if (ring_buffer_swap_cpu(op_ring_buffer_read,
                                 op_ring_buffer_write,
                                 cpu))
                return NULL;
        e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL);
        if (e)
-               return ring_buffer_event_data(e);
+               goto event;
        return NULL;
+
+event:
+       entry->event = e;
+       entry->sample = ring_buffer_event_data(e);
+       entry->size = (ring_buffer_event_length(e) - sizeof(struct op_sample))
+               / sizeof(entry->sample->data[0]);
+       entry->data = entry->sample->data;
+       return entry->sample;
 }
 
 unsigned long op_cpu_buffer_entries(int cpu)