diff --git a/[refs] b/[refs]
index 104e41629df3..625214661203 100644
--- 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
index fc45ba887d05..e395693abdb1 100644
--- 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();