From: Ingo Molnar 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=0806ebd974590ab24ab357d5d87db744e56bfe13;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 43f19c1fed3a,46066391288a..cb54cd002f49 --- 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;