From 477bbb7bf79330d97b72296d974fdfbd26310972 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Jan 2008 21:07:59 +0100
Subject: [PATCH] --- yaml --- r: 76111 b: refs/heads/master c:
 b842271fbb9c8b5fd0e1c3e1895a3b67ba5bcc54 h: refs/heads/master i:   76109:
 c4299ca8e6efa3eb4f588f46b4d2613e6ee57c79   76107:
 2db2eb79533c01447987c69831b26765c7bde3bb   76103:
 919c94baf73f966fca476cf99a9a20ba80f7ac28   76095:
 b90b586e4f5693ae03cd62219e6ec53d5943414c v: v3

---
 [refs]                        |  2 +-
 trunk/arch/arm/kernel/time.c  | 11 -----------
 trunk/arch/ia64/kernel/time.c | 27 ---------------------------
 trunk/kernel/printk.c         |  5 -----
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/[refs] b/[refs]
index 0697dbbabe16..ea3420e71d56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d713f519332e029d43eca8462629314eee1ded86
+refs/heads/master: b842271fbb9c8b5fd0e1c3e1895a3b67ba5bcc54
diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c
index f6f3689a86ee..e59b5b84168d 100644
--- a/trunk/arch/arm/kernel/time.c
+++ b/trunk/arch/arm/kernel/time.c
@@ -79,17 +79,6 @@ static unsigned long dummy_gettimeoffset(void)
 }
 #endif
 
-/*
- * 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;
 
 /*
diff --git a/trunk/arch/ia64/kernel/time.c b/trunk/arch/ia64/kernel/time.c
index 2bb84214e5f1..3ab042720970 100644
--- a/trunk/arch/ia64/kernel/time.c
+++ b/trunk/arch/ia64/kernel/time.c
@@ -344,33 +344,6 @@ udelay (unsigned long usecs)
 }
 EXPORT_SYMBOL(udelay);
 
-static unsigned long long ia64_itc_printk_clock(void)
-{
-	if (ia64_get_kr(IA64_KR_PER_CPU_DATA))
-		return sched_clock();
-	return 0;
-}
-
-static unsigned long long ia64_default_printk_clock(void)
-{
-	return (unsigned long long)(jiffies_64 - INITIAL_JIFFIES) *
-		(1000000000/HZ);
-}
-
-unsigned long long (*ia64_printk_clock)(void) = &ia64_default_printk_clock;
-
-unsigned long long printk_clock(void)
-{
-	return ia64_printk_clock();
-}
-
-void __init
-ia64_setup_printk_clock(void)
-{
-	if (!(sal_platform_features & IA64_SAL_PLATFORM_FEATURE_ITC_DRIFT))
-		ia64_printk_clock = ia64_itc_printk_clock;
-}
-
 /* IA64 doesn't cache the timezone */
 void update_vsyscall_tz(void)
 {
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 5f9d053699f9..3b7c968d0ef9 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -573,11 +573,6 @@ static int __init printk_time_setup(char *str)
 
 __setup("time", printk_time_setup);
 
-__attribute__((weak)) unsigned long long printk_clock(void)
-{
-	return sched_clock();
-}
-
 /* Check if we have any console registered that can be called early in boot. */
 static int have_callable_console(void)
 {