Messages in this thread Patch in this message | | | Date | Wed, 23 Feb 2011 12:06:53 GMT | From | tip-bot for Peter Zijlstra <> | Subject | [tip:perf/core] perf: Simplify task_clock_event_read() |
| |
Commit-ID: 768a06e2ca49cdf72389208cfc056a36cf8bc5e3 Gitweb: http://git.kernel.org/tip/768a06e2ca49cdf72389208cfc056a36cf8bc5e3 Author: Peter Zijlstra <a.p.zijlstra@chello.nl> AuthorDate: Tue, 22 Feb 2011 16:52:24 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Wed, 23 Feb 2011 11:35:47 +0100
perf: Simplify task_clock_event_read()
There is no point in us having different code paths for nmi and !nmi here, so remove the !nmi one.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/perf_event.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index dadeaea..64a018e 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -5810,16 +5810,9 @@ static void task_clock_event_del(struct perf_event *event, int flags) static void task_clock_event_read(struct perf_event *event) { - u64 time; - - if (!in_nmi()) { - update_context_time(event->ctx); - time = event->ctx->time; - } else { - u64 now = perf_clock(); - u64 delta = now - event->ctx->timestamp; - time = event->ctx->time + delta; - } + u64 now = perf_clock(); + u64 delta = now - event->ctx->timestamp; + u64 time = event->ctx->time + delta; task_clock_event_update(event, time); }
| |