Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 13 insertions, 6 deletions

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index cb54cd002f49..f55cc3a765a1 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -53,12 +53,6 @@ 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;
@@ -98,6 +92,19 @@ static int read_or_die(void *data, int size)
         return r;
 }
 
+/* If it fails, the next read will report it */
+static void skip(int size)
+{
+        char buf[BUFSIZ];
+        int r;
+
+        while (size) {
+                r = size > BUFSIZ ? BUFSIZ : size;
+                read_or_die(buf, r);
+                size -= r;
+        };
+}
+
 static unsigned int read4(void)
 {
         unsigned int data;