]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
m68k: use of 64 div instruction is chip specific
authorGreg Ungerer <gerg@uclinux.org>
Tue, 18 Oct 2011 06:38:52 +0000 (16:38 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 8 Nov 2011 04:44:14 +0000 (14:44 +1000)
The use of the 64 div instruction should not be based on whether we
are running MMU enabled or not. It is chip specific. The original
68000 family and the ColdFire CPU family do not support it, the
other 680x0 CPU varients do. So make the conditional check based on
that, not CONFIG_MMU.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/div64.h

index edb66148a71dc85886e3112d9af2f08019d7856e..7265e405a3042784ebe74eb66b33347487971efc 100644 (file)
@@ -1,7 +1,9 @@
 #ifndef _M68K_DIV64_H
 #define _M68K_DIV64_H
 
-#ifdef CONFIG_MMU
+#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE)
+#include <asm-generic/div64.h>
+#else
 
 #include <linux/types.h>
 
@@ -27,8 +29,6 @@
        __rem;                                                  \
 })
 
-#else
-#include <asm-generic/div64.h>
-#endif /* CONFIG_MMU */
+#endif /* CONFIG_M68000 || CONFIG_COLDFIRE */
 
 #endif /* _M68K_DIV64_H */