Merge /spare/repo/linux-2.6/

[linux-2.6-omap-h63xx.git] / arch / x86_64 / lib / delay.c

diff --git a/arch/x86_64/lib/delay.c b/arch/x86_64/lib/delay.c
index aed61a668a1bebbf5b4661cd5fad774e03cca895..841bd738a189821c4046b85870d02f75ee4699e6 100644 (file)
--- a/arch/x86_64/lib/delay.c
+++ b/arch/x86_64/lib/delay.c
@@ -12,12 +12,17 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <asm/delay.h>
+#include <asm/msr.h>
 
 #ifdef CONFIG_SMP
 #include <asm/smp.h>
 #endif
 
-int x86_udelay_tsc = 0;                /* Delay via TSC */
+int read_current_timer(unsigned long *timer_value)
+{
+       rdtscll(*timer_value);
+       return 0;
+}
 
 void __delay(unsigned long loops)
 {