Messages in this thread | | | Date | Mon, 12 Oct 2009 11:11:34 +0200 | From | Ingo Molnar <> | Subject | Re: [PATCH 1/1] perf tools: Move threads & last_match to threads.c |
| |
* Arnaldo Carvalho de Melo <acme@redhat.com> wrote:
> This was just being copy'n'pasted all over. > > Cc: Frederic Weisbecker <fweisbec@gmail.com> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Paul Mackerras <paulus@samba.org> > Cc: Mike Galbraith <efault@gmx.de> > Cc: Paul Mackerras <paulus@samba.org> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > --- > tools/perf/builtin-annotate.c | 18 +++++++----------- > tools/perf/builtin-report.c | 17 +++++++---------- > tools/perf/builtin-sched.c | 15 ++++++--------- > tools/perf/builtin-trace.c | 9 +++------ > tools/perf/util/thread.c | 40 ++++++++++++++++++---------------------- > tools/perf/util/thread.h | 12 ++++-------- > 6 files changed, 45 insertions(+), 66 deletions(-)
hm, mind refreshing this against latest -tip? It doesnt apply anymore:
Hunk #2 FAILED at 635. Hunk #3 FAILED at 1036. Hunk #4 FAILED at 1052. Hunk #5 succeeded at 1122 (offset -5 lines). Hunk #6 succeeded at 1651 (offset 65 lines). Hunk #7 succeeded at 1657 (offset -2 lines). 3 out of 7 hunks FAILED -- rejects in file tools/perf/builtin-sched.c patching file tools/perf/builtin-trace.c patching file tools/perf/util/thread.c Hunk #1 FAILED at 6. Hunk #2 FAILED at 55. Hunk #3 succeeded at 62 (offset -4 lines). Hunk #4 FAILED at 84. Hunk #5 succeeded at 197 (offset -14 lines). 3 out of 5 hunks FAILED -- rejects in file tools/perf/util/thread.c patching file tools/perf/util/thread.h Hunk #1 FAILED at 15. 1 out of 1 hunk FAILED -- rejects in file tools/perf/util/thread.h
or have i missed some prereq patch?
Ingo
| |