From: Robert Richter <robert.richter@amd.com>
Date: Fri, 23 Apr 2010 14:47:51 +0000 (+0200)
Subject: Merge commit 'tip/tracing/core' into oprofile/core
X-Git-Tag: v2.6.35-rc1~523^2~10
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=b971f06187d83b5c03d2b597cccdfef421c0ca91

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

Conflicts:
	drivers/oprofile/cpu_buffer.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
---

b971f06187d83b5c03d2b597cccdfef421c0ca91
diff --cc drivers/oprofile/cpu_buffer.c
index de82183,7581dbe..0ac8b06
--- a/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))