diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-19 06:48:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-19 06:48:09 -0400 |
| commit | c8710ad38900153af7a3e6762e99c062cfa46443 (patch) | |
| tree | a0c0632274c4eb72f51e99a5861f71cffe65ea60 /kernel/perf_event.c | |
| parent | 6016ee13db518ab1cd0cbf43fc2ad5712021e338 (diff) | |
| parent | 86397dc3ccfc0e17b7550d05eaf15fe91f6498dd (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index f416aef242c3..0d38f27ad885 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -214,7 +214,7 @@ static void perf_unpin_context(struct perf_event_context *ctx) | |||
| 214 | 214 | ||
| 215 | static inline u64 perf_clock(void) | 215 | static inline u64 perf_clock(void) |
| 216 | { | 216 | { |
| 217 | return cpu_clock(raw_smp_processor_id()); | 217 | return local_clock(); |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | /* | 220 | /* |