rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / arch / m68k / include / asm / div64.h

diff --git a/arch/m68k/include/asm/div64.h b/arch/m68k/include/asm/div64.h
index ef881cfbbca90987bf0e93c9271537317c15886c..444ea8a09e9f3386434e89d502c41d1f4107302e 100644 (file)
--- a/arch/m68k/include/asm/div64.h
+++ b/arch/m68k/include/asm/div64.h
@@ -15,17 +15,16 @@
                unsigned long long n64;                         \
        } __n;                                                  \
        unsigned long __rem, __upper;                           \
-       unsigned long __base = (base);                          \
                                                                \
        __n.n64 = (n);                                          \
        if ((__upper = __n.n32[0])) {                           \
                asm ("divul.l %2,%1:%0"                         \
-                    : "=d" (__n.n32[0]), "=d" (__upper)        \
-                    : "d" (__base), "0" (__n.n32[0]));         \
+                       : "=d" (__n.n32[0]), "=d" (__upper)     \
+                       : "d" (base), "0" (__n.n32[0]));        \
        }                                                       \
        asm ("divu.l %2,%1:%0"                                  \
-            : "=d" (__n.n32[1]), "=d" (__rem)                  \
-            : "d" (__base), "1" (__upper), "0" (__n.n32[1]));  \
+               : "=d" (__n.n32[1]), "=d" (__rem)               \
+               : "d" (base), "1" (__upper), "0" (__n.n32[1])); \
        (n) = __n.n64;                                          \
        __rem;                                                  \
 })