Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Ingo Molnar [Sun, 22 May 2011 08:07:37 +0000 (10:07 +0200)]
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>

1  2 
tools/perf/builtin-test.c
tools/perf/builtin-top.c
tools/perf/util/evlist.c
tools/perf/util/evlist.h
tools/perf/util/include/linux/list.h
tools/perf/util/python.c

Simple merge
@@@ -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);
Simple merge
Simple merge
@@@ -1,4 -1,4 +1,6 @@@
  #include <linux/kernel.h>
++#include <linux/prefetch.h>
++
  #include "../../../../include/linux/list.h"
  
  #ifndef PERF_LIST_H
Simple merge