From 901012462aca1e23b733b1b6abec6a88faad7b5b Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 9 Jun 2009 21:12:00 +0000
Subject: [PATCH] --- yaml --- r: 151049 b: refs/heads/master c:
 177996e6e20f15004d6757d9b859f57d181ef443 h: refs/heads/master i:   151047:
 7d34a78097471acf0f84de5fc7e0dc3a7be4da82 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/powerpc/Kconfig       |  4 ----
 trunk/arch/powerpc/kernel/time.c | 10 ++++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2968a147ac00..21180199ac4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 529273c1ad5f591d066a9d90a6bd6affa19c5461
+refs/heads/master: 177996e6e20f15004d6757d9b859f57d181ef443
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 93a61898b259..eae0c2bbbf38 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -93,10 +93,6 @@ config GENERIC_HWEIGHT
 	bool
 	default y
 
-config GENERIC_CALIBRATE_DELAY
-	bool
-	default y
-
 config GENERIC_FIND_NEXT_BIT
 	bool
 	default y
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
index bee1443da763..15391c2ab013 100644
--- a/trunk/arch/powerpc/kernel/time.c
+++ b/trunk/arch/powerpc/kernel/time.c
@@ -52,6 +52,7 @@
 #include <linux/jiffies.h>
 #include <linux/posix-timers.h>
 #include <linux/irq.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/processor.h>
@@ -1143,6 +1144,15 @@ void div128_by_32(u64 dividend_high, u64 dividend_low,
 
 }
 
+/* We don't need to calibrate delay, we use the CPU timebase for that */
+void calibrate_delay(void)
+{
+	/* Some generic code (such as spinlock debug) use loops_per_jiffy
+	 * as the number of __delay(1) in a jiffy, so make it so
+	 */
+	loops_per_jiffy = tb_ticks_per_jiffy;
+}
+
 static int __init rtc_init(void)
 {
 	struct platform_device *pdev;