From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 3 May 2010 06:29:35 +0000 (+0200)
Subject: Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Tag: v2.6.35-rc1~3^2~126
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=0806ebd974590ab24ab357d5d87db744e56bfe13

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

0806ebd974590ab24ab357d5d87db744e56bfe13
diff --cc tools/perf/util/trace-event-read.c
index 43f19c1,4606639..cb54cd0
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@@ -51,8 -51,13 +51,14 @@@ static int long_size
  static unsigned long	page_size;
  
  static ssize_t calc_data_size;
 +static bool repipe;
  
+ /* If it fails, the next read will report it */
+ static void skip(int size)
+ {
+ 	lseek(input_fd, size, SEEK_CUR);
+ }
+ 
  static int do_read(int fd, void *buf, int size)
  {
  	int rsize = size;