CRISv32: use GENERIC_SCHED_CLOCK

[linux-2.6-block.git] / arch / cris / kernel / time.c

diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c
index fe6acdabbc8d755b1d8de64a2ab7a917317896f8..7780d379522f49bcebddc54ddfc57f7d1d6d1e34 100644 (file)
--- 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)