[PATCH] Fix mdelay's use of 'msec' name

The mdelay() macro does the wrong thing if you try to use it with an
argument expression that contains the (perfectly natural) variable name
'msec'.

Fix it to use an internal variable that doesn't clash with normal
naming.

diff --git a/include/linux/delay.h b/include/linux/delay.h
index 1ddf999dab421b686f5620543e6b0626c6a7270b..36abaa6b19fdd9c12c6aad88152c95ec867a929d 100644 (file)
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -27,11 +27,11 @@ extern unsigned long loops_per_jiffy;
 
 #ifdef notdef
 #define mdelay(n) (\
-       {unsigned long msec=(n); while (msec--) udelay(1000);})
+       {unsigned long __ms=(n); while (__ms--) udelay(1000);})
 #else
 #define mdelay(n) (\
        (__builtin_constant_p(n) && (n)<=MAX_UDELAY_MS) ? udelay((n)*1000) : \
-       ({unsigned long msec=(n); while (msec--) udelay(1000);}))
+       ({unsigned long __ms=(n); while (__ms--) udelay(1000);}))
 #endif
 
 #ifndef ndelay