[PATCH] m68k: use of 64 div instruction is chip specific

[PATCH] m68k: use of 64 div instruction is chip specific

[gerg]

From: Greg Ungerer <gerg@uclinux.org>

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>
---
 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

Re: [PATCH] m68k: use of 64 div instruction is chip specific

[Geert Uytterhoeven]

On Fri, Oct 21, 2011 at 09:08,  <gerg@snapgear.com> wrote:
> From: Greg Ungerer <gerg@uclinux.org>
>
> 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 |    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 */

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds