Merge commit 'tip/tracing/core' into oprofile/core

Conflicts:
	drivers/oprofile/cpu_buffer.c

Signed-off-by: Robert Richter <[email protected]>

diff --cc drivers/oprofile/cpu_buffer.c
index de82183bb9b36b1c7d226e6fb67b77527f61d4bd,7581dbe456da91de62aa5f96a8479f9058999390..0ac8b065ee0233b7884e87758cce68500b118f33
--- 1/drivers/oprofile/cpu_buffer.c
--- 2/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@@ -159,10 -186,19 +159,10 @@@ int op_cpu_buffer_write_commit(struct o
  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, cpu, NULL);
 -      e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL, NULL);
 -      if (e)
 -              goto event;
 -      if (ring_buffer_swap_cpu(op_ring_buffer_read,
 -                               op_ring_buffer_write,
 -                               cpu))
++      e = ring_buffer_consume(op_ring_buffer, cpu, NULL, NULL);
 +      if (!e)
                return NULL;
 -      e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL, NULL);
 -      if (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))