Merge commit 'v2.6.35-rc3' into sched/core

[mv-sheeva.git] / kernel / perf_event.c

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index ff86c558af4c28dd4c9a7ea92cc592b70bee6d7d..7e32b51ff043b9a7fb47ef17aed2aef295d3de66 100644 (file)
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -214,7 +214,7 @@ static void perf_unpin_context(struct perf_event_context *ctx)
 
 static inline u64 perf_clock(void)
 {
-       return cpu_clock(raw_smp_processor_id());
+       return local_clock();
 }
 
 /*