From: Russell King Date: Mon, 8 Jan 2007 19:49:12 +0000 (+0000) Subject: [ARM] Provide basic printk_clock() implementation X-Git-Tag: v2.6.20-rc5~40^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e97126cd9056b3b42cdc862ace2ed66f8026f55b;p=linux-2.6 [ARM] Provide basic printk_clock() implementation Current sched_clock() implementations on ARM cause unbootable kernels with PRINTK_TIME support enabled. To avoid this, provide a basic printk_clock() implementation which avoids sched_clock() being called before the page tables have been set up. Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 174cd4900b..3c8cdcfe8d 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -87,6 +87,17 @@ unsigned long long __attribute__((weak)) sched_clock(void) return (unsigned long long)jiffies * (1000000000 / HZ); } +/* + * An implementation of printk_clock() independent from + * sched_clock(). This avoids non-bootable kernels when + * printk_clock is enabled. + */ +unsigned long long printk_clock(void) +{ + return (unsigned long long)(jiffies - INITIAL_JIFFIES) * + (1000000000 / HZ); +} + static unsigned long next_rtc_update; /*