projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto merge with /home/aegl/GIT/linus
[powerpc.git]
/
arch
/
x86_64
/
lib
/
delay.c
diff --git
a/arch/x86_64/lib/delay.c
b/arch/x86_64/lib/delay.c
index
aed61a6
..
33a873a
100644
(file)
--- a/
arch/x86_64/lib/delay.c
+++ b/
arch/x86_64/lib/delay.c
@@
-12,6
+12,7
@@
#include <linux/sched.h>
#include <linux/delay.h>
#include <asm/delay.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <asm/delay.h>
+#include <asm/msr.h>
#ifdef CONFIG_SMP
#include <asm/smp.h>
#ifdef CONFIG_SMP
#include <asm/smp.h>
@@
-19,6
+20,12
@@
int x86_udelay_tsc = 0; /* Delay via TSC */
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)
{
unsigned bclock, now;
void __delay(unsigned long loops)
{
unsigned bclock, now;