X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Fcris%2Fkernel%2Ftime.c;h=7780d379522f49bcebddc54ddfc57f7d1d6d1e34;hb=c8b350424d1862619c311204290cd42bae4ebaa3;hp=fe6acdabbc8d755b1d8de64a2ab7a917317896f8;hpb=84806ade19fe07ad30049298d12c3e58eebb192d;p=firefly-linux-kernel-4.4.55.git

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)