From 442d59507ed52ab74d8935cf659a509f18e7e529 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 8 Jan 2007 19:49:12 +0000 Subject: [PATCH] --- yaml --- r: 45338 b: refs/heads/master c: e97126cd9056b3b42cdc862ace2ed66f8026f55b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/time.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f887ece518a..650529855cfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6020dff09252e3670a89edb36baaa4afb9b10d15 +refs/heads/master: e97126cd9056b3b42cdc862ace2ed66f8026f55b diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c index 174cd4900bf9..3c8cdcfe8d4a 100644 --- a/trunk/arch/arm/kernel/time.c +++ b/trunk/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; /*