[PATCHv2 7/8] m68k: only generate FPU instructions if CONFIG_FPU enabled

[PATCHv2 7/8] m68k: only generate FPU instructions if CONFIG_FPU enabled

[Greg Ungerer]

Most of the m68k code that supports a hardware FPU is surrounded by
CONFIG_FPU. Be consistent and surround the hardware FPU instruction
setup in setup_mm.c with CONFIG_FPU as well as the check for
CONFIG_M68KFPU_EMU_ONLY.

The existing classic m68k architectures all define CONFIG_FPU, so they
see no change from this. But on ColdFire where we do not support the
emulated FP code we can now compile without CONFIG_FPU being set as well.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
---
 arch/m68k/kernel/setup_mm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 13f4640..adbb806 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -245,7 +245,7 @@ void __init setup_arch(char **cmdline_p)
 	 * We should really do our own FPU check at startup.
 	 * [what do we do with buggy 68LC040s? if we have problems
 	 *  with them, we should add a test to check_bugs() below] */
-#ifndef CONFIG_M68KFPU_EMU_ONLY
+#if defined(CONFIG_FPU) && !defined(CONFIG_M68KFPU_EMU_ONLY)
 	/* clear the fpu if we have one */
 	if (m68k_fputype & (FPU_68881|FPU_68882|FPU_68040|FPU_68060|FPU_COLDFIRE)) {
 		volatile int zero = 0;
-- 
1.9.1

Re: [PATCHv2 7/8] m68k: only generate FPU instructions if CONFIG_FPU enabled

[Geert Uytterhoeven]

Hi Greg,

On Tue, Aug 30, 2016 at 9:29 AM, Greg Ungerer <gerg@linux-m68k.org> wrote:
> Most of the m68k code that supports a hardware FPU is surrounded by
> CONFIG_FPU. Be consistent and surround the hardware FPU instruction
> setup in setup_mm.c with CONFIG_FPU as well as the check for
> CONFIG_M68KFPU_EMU_ONLY.
>
> The existing classic m68k architectures all define CONFIG_FPU, so they
> see no change from this. But on ColdFire where we do not support the
> emulated FP code we can now compile without CONFIG_FPU being set as well.
>
> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>

Thanks for the update. Series looks good to me now.

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

Re: [PATCHv2 7/8] m68k: only generate FPU instructions if CONFIG_FPU enabled

[Greg Ungerer]

Hi Geert,

On 30/08/16 17:32, Geert Uytterhoeven wrote:
> Hi Greg,
> 
> On Tue, Aug 30, 2016 at 9:29 AM, Greg Ungerer <gerg@linux-m68k.org> wrote:
>> Most of the m68k code that supports a hardware FPU is surrounded by
>> CONFIG_FPU. Be consistent and surround the hardware FPU instruction
>> setup in setup_mm.c with CONFIG_FPU as well as the check for
>> CONFIG_M68KFPU_EMU_ONLY.
>>
>> The existing classic m68k architectures all define CONFIG_FPU, so they
>> see no change from this. But on ColdFire where we do not support the
>> emulated FP code we can now compile without CONFIG_FPU being set as well.
>>
>> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
> 
> Thanks for the update. Series looks good to me now.

Thanks for the review. I'll push it into the for-next branch
of the m68knommu tree (if you have no problem with it going
upstream via that tree).

Regards
Greg