diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-12-21 14:32:01 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-12-25 05:04:12 -0500 |
commit | a5a1d1c2914b5316924c7893eb683a5420ebd3be (patch) | |
tree | 9078b8a179031e7e8b320e1c69f182cc285e7b5d /kernel/trace/trace.c | |
parent | 7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba (diff) |
clocksource: Use a plain u64 instead of cycle_t
There is no point in having an extra type for extra confusion. u64 is
unambiguous.
Conversion was done with the following coccinelle script:
@rem@
@@
-typedef u64 cycle_t;
@fix@
typedef cycle_t;
@@
-cycle_t
+u64
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 66f829c47bec..d7449783987a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -236,7 +236,7 @@ static int __init set_tracepoint_printk(char *str) | |||
236 | } | 236 | } |
237 | __setup("tp_printk", set_tracepoint_printk); | 237 | __setup("tp_printk", set_tracepoint_printk); |
238 | 238 | ||
239 | unsigned long long ns2usecs(cycle_t nsec) | 239 | unsigned long long ns2usecs(u64 nsec) |
240 | { | 240 | { |
241 | nsec += 500; | 241 | nsec += 500; |
242 | do_div(nsec, 1000); | 242 | do_div(nsec, 1000); |
@@ -573,7 +573,7 @@ int trace_pid_write(struct trace_pid_list *filtered_pids, | |||
573 | return read; | 573 | return read; |
574 | } | 574 | } |
575 | 575 | ||
576 | static cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu) | 576 | static u64 buffer_ftrace_now(struct trace_buffer *buf, int cpu) |
577 | { | 577 | { |
578 | u64 ts; | 578 | u64 ts; |
579 | 579 | ||
@@ -587,7 +587,7 @@ static cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu) | |||
587 | return ts; | 587 | return ts; |
588 | } | 588 | } |
589 | 589 | ||
590 | cycle_t ftrace_now(int cpu) | 590 | u64 ftrace_now(int cpu) |
591 | { | 591 | { |
592 | return buffer_ftrace_now(&global_trace.trace_buffer, cpu); | 592 | return buffer_ftrace_now(&global_trace.trace_buffer, cpu); |
593 | } | 593 | } |