---

yaml --- r: 288394 b: refs/heads/master c: a7f4255 h: refs/heads/master v: v3
git-mirror · Mar 9, 2012 · 9bb5396 · 9bb5396
1 parent 50bf02b
commit 9bb5396
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c447064de46a942e2d91a4cf22afa70538d781dd
+refs/heads/master: a7f4255f906f60f72e00aad2fb000939449ff32e
diff --git a/trunk/arch/x86/lib/delay.c b/trunk/arch/x86/lib/delay.c
@@ -48,9 +48,9 @@ static void delay_loop(unsigned long loops)
 }
 
 /* TSC based delay: */
-static void delay_tsc(unsigned long loops)
+static void delay_tsc(unsigned long __loops)
 {
-	unsigned long bclock, now;
+	u32 bclock, now, loops = __loops;
 	int cpu;
 
 	preempt_disable();