]> err.no Git - linux-2.6/commitdiff
[MIPS] Change names of local variables to silence sparse
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Tue, 10 Jul 2007 15:24:14 +0000 (00:24 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 10 Jul 2007 16:33:06 +0000 (17:33 +0100)
This patch is an workaround for these sparse warnings:

linux/include/linux/calc64.h:25:17: warning: symbol '__quot' shadows an earlier one
linux/include/linux/calc64.h:25:17: originally declared here
linux/include/linux/calc64.h:25:17: warning: symbol '__mod' shadows an earlier one
linux/include/linux/calc64.h:25:17: originally declared here

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
include/asm-mips/div64.h

index 66189f5f6399ca4613ecdc5ba88722925a5dbfad..716371bd098076c7297e5ef90a2400d42387c620 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #define do_div64_32(res, high, low, base) ({ \
-       unsigned long __quot, __mod; \
+       unsigned long __quot32, __mod32; \
        unsigned long __cf, __tmp, __tmp2, __i; \
        \
        __asm__(".set   push\n\t" \
                "bnez   %4, 0b\n\t" \
                " srl   %5, %1, 0x1f\n\t" \
                ".set   pop" \
-               : "=&r" (__mod), "=&r" (__tmp), "=&r" (__quot), "=&r" (__cf), \
+               : "=&r" (__mod32), "=&r" (__tmp), \
+                 "=&r" (__quot32), "=&r" (__cf), \
                  "=&r" (__i), "=&r" (__tmp2) \
                : "Jr" (base), "0" (high), "1" (low)); \
        \
-       (res) = __quot; \
-       __mod; })
+       (res) = __quot32; \
+       __mod32; })
 
 #define do_div(n, base) ({ \
        unsigned long long __quot; \