From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 22 May 2011 08:07:37 +0000 (+0200)
Subject: Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Tag: v3.0-rc1~25^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ac1bbcf13c56a19927df670f429eb0c3c11f8e5;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'perf/core' of git://git./linux/kernel/git/frederic/random-tracing into perf/urgent

Conflicts:
	tools/perf/builtin-top.c

Semantic conflict:
	util/include/linux/list.h        # fix prefetch.h removal fallout

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

3ac1bbcf13c56a19927df670f429eb0c3c11f8e5
diff --cc tools/perf/builtin-top.c
index ebfc7cf,74f533c..2d7934e
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@@ -805,9 -805,14 +805,14 @@@ static void perf_session__mmap_read_idx
  {
  	struct perf_sample sample;
  	union perf_event *event;
+ 	int ret;
  
 -	while ((event = perf_evlist__read_on_cpu(top.evlist, cpu)) != NULL) {
 +	while ((event = perf_evlist__mmap_read(top.evlist, idx)) != NULL) {
- 		perf_session__parse_sample(self, event, &sample);
+ 		ret = perf_session__parse_sample(self, event, &sample);
+ 		if (ret) {
+ 			pr_err("Can't parse sample, err = %d\n", ret);
+ 			continue;
+ 		}
  
  		if (event->header.type == PERF_RECORD_SAMPLE)
  			perf_event__process_sample(event, &sample, self);
diff --cc tools/perf/util/include/linux/list.h
index 356c7e4,356c7e4..ed33609
--- a/tools/perf/util/include/linux/list.h
+++ b/tools/perf/util/include/linux/list.h
@@@ -1,4 -1,4 +1,6 @@@
  #include <linux/kernel.h>
++#include <linux/prefetch.h>
++
  #include "../../../../include/linux/list.h"
  
  #ifndef PERF_LIST_H