diff options
| author |   Rabin Vincent <rabin@rab.in> | 2015-03-09 18:51:31 +0100 |
|---|---|---|
| committer |   Jesper Nilsson <jespern@axis.com> | 2015-03-25 11:03:41 +0100 |
| commit | d3dad475b2839b9964ef54211e135eb6fb9952f9 (patch) | |
| tree | fcb7df761ed78f5899df8a74dd1726c0fdb43030 /arch/cris/kernel | |
| parent | CRISv32: use MMIO clocksource (diff) | |
| download | linux-dev-d3dad475b2839b9964ef54211e135eb6fb9952f9.tar.xz linux-dev-d3dad475b2839b9964ef54211e135eb6fb9952f9.zip | |
CRISv32: use GENERIC_SCHED_CLOCK
Provide a fast sched clock using the free-running timer and the generic
sched_clock infrastructure.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jespern@axis.com>
Diffstat (limited to 'arch/cris/kernel')
| -rw-r--r-- | arch/cris/kernel/time.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index fe6acdabbc8d..7780d379522f 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c @@ -79,11 +79,13 @@ cris_do_profile(struct pt_regs* regs) #endif } +#ifndef CONFIG_GENERIC_SCHED_CLOCK unsigned long long sched_clock(void) { return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ) + get_ns_in_jiffie(); } +#endif static int __init init_udelay(void) |