diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-05-25 04:48:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 04:34:49 -0400 |
commit | c676329abb2b8359d9a5d734dec0c81779823fd6 (patch) | |
tree | b6c33715176221a87100228399c2a6f5049e44ea /arch/parisc | |
parent | 95ae3c59fa8ad616c73745e21154b5af0fb10168 (diff) |
sched_clock: Add local_clock() API and improve documentation
For people who otherwise get to write: cpu_clock(smp_processor_id()),
there is now: local_clock().
Also, as per suggestion from Andrew, provide some documentation on
the various clock interfaces, and minimize the unsigned long long vs
u64 mess.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jaxboe@fusionio.com>
LKML-Reference: <1275052414.1645.52.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/kernel/ftrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c index 9877372ffdba..5beb97bafbb1 100644 --- a/arch/parisc/kernel/ftrace.c +++ b/arch/parisc/kernel/ftrace.c | |||
@@ -82,7 +82,7 @@ unsigned long ftrace_return_to_handler(unsigned long retval0, | |||
82 | unsigned long ret; | 82 | unsigned long ret; |
83 | 83 | ||
84 | pop_return_trace(&trace, &ret); | 84 | pop_return_trace(&trace, &ret); |
85 | trace.rettime = cpu_clock(raw_smp_processor_id()); | 85 | trace.rettime = local_clock(); |
86 | ftrace_graph_return(&trace); | 86 | ftrace_graph_return(&trace); |
87 | 87 | ||
88 | if (unlikely(!ret)) { | 88 | if (unlikely(!ret)) { |
@@ -126,7 +126,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | |||
126 | return; | 126 | return; |
127 | } | 127 | } |
128 | 128 | ||
129 | calltime = cpu_clock(raw_smp_processor_id()); | 129 | calltime = local_clock(); |
130 | 130 | ||
131 | if (push_return_trace(old, calltime, | 131 | if (push_return_trace(old, calltime, |
132 | self_addr, &trace.depth) == -EBUSY) { | 132 | self_addr, &trace.depth) == -EBUSY) { |