From: Greg Ungerer <gerg@xxxxxxxxxxx> 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@xxxxxxxxxxx> --- arch/m68k/include/asm/div64.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/m68k/include/asm/div64.h b/arch/m68k/include/asm/div64.h index edb6614..7265e40 100644 --- a/arch/m68k/include/asm/div64.h +++ b/arch/m68k/include/asm/div64.h @@ -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 */ -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
