aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/cris/kernel')
-rw-r--r--arch/cris/kernel/time.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c
index c72730d20ef6..b5096430ce1c 100644
--- a/arch/cris/kernel/time.c
+++ b/arch/cris/kernel/time.c
@@ -39,13 +39,16 @@ int have_rtc; /* used to remember if we have an RTC or not */;
39extern unsigned long loops_per_jiffy; /* init/main.c */ 39extern unsigned long loops_per_jiffy; /* init/main.c */
40unsigned long loops_per_usec; 40unsigned long loops_per_usec;
41 41
42
43#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
42extern unsigned long do_slow_gettimeoffset(void); 44extern unsigned long do_slow_gettimeoffset(void);
43static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset; 45static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset;
44 46
45u32 arch_gettimeoffset(void) 47u32 arch_gettimeoffset(void)
46{ 48{
47 return do_gettimeoffset() * 1000; 49 return do_gettimeoffset() * 1000;
48} 50}
51#endif
49 52
50/* 53/*
51 * BUG: This routine does not handle hour overflow properly; it just 54 * BUG: This routine does not handle hour overflow properly; it just
@@ -151,7 +154,7 @@ cris_do_profile(struct pt_regs* regs)
151 154
152unsigned long long sched_clock(void) 155unsigned long long sched_clock(void)
153{ 156{
154 return (unsigned long long)jiffies * (1000000000 / HZ) + 157 return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ) +
155 get_ns_in_jiffie(); 158 get_ns_in_jiffie();
156} 159}
157 160