aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-03-28 03:40:09 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-28 03:40:09 -0800
commit6c51e28ffbbebf49437ec63ac4f9e385d60827e5 (patch)
treea63a3d9564eb8a4748ece63bc6b86296080e12bd
parente7447e64136bcc51ea8d65266c607a1df506d26e (diff)
downloadhistory-6c51e28ffbbebf49437ec63ac4f9e385d60827e5.tar.gz
[PATCH] x86_64: Fix missing delay when the TSC counter just overflowed
Fix missing delay when the TSC counter just overflowed Noticed by Jan Beulich Signed-off-by: Andi Kleen <ak@suse.de> Cc: <Jbeulich@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/lib/delay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/lib/delay.c b/arch/x86_64/lib/delay.c
index 05689cc5490173..6e2d66472eb193 100644
--- a/arch/x86_64/lib/delay.c
+++ b/arch/x86_64/lib/delay.c
@@ -21,7 +21,7 @@ int x86_udelay_tsc = 0; /* Delay via TSC */
void __delay(unsigned long loops)
{
- unsigned long bclock, now;
+ unsigned bclock, now;
rdtscl(bclock);
do