Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e97126cd9056b3b42cdc862ace2ed66f8026f55b Commit: e97126cd9056b3b42cdc862ace2ed66f8026f55b Parent: 6020dff09252e3670a89edb36baaa4afb9b10d15 Author: Russell King <[EMAIL PROTECTED]> AuthorDate: Mon Jan 8 19:49:12 2007 +0000 Committer: Russell King <[EMAIL PROTECTED]> CommitDate: Mon Jan 8 19:50:03 2007 +0000
[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 <[EMAIL PROTECTED]> --- arch/arm/kernel/time.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 174cd49..3c8cdcf 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; /* - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html