From: Greg Ungerer <gerg@linux-m68k.org>
Date: Mon, 29 Aug 2016 07:12:32 +0000 (+1000)
Subject: m68k: don't panic if no hardware FPU defined
X-Git-Tag: v4.9-rc1~117^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a744007c332f9d604b95aaecb106596c52ab001;p=karo-tx-linux.git

m68k: don't panic if no hardware FPU defined

If we boot up and find no hardware FPU we panic and die.

Change this behavior to be that if we boot up and we _expect_ a hardware
FPU to be present then panic. Don't panic if we don't actually expect to
have any hardware FPU.

This lets us compile a kernel without FPU if we really choose too.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
---

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index adbb80698da2..9afad2b64c13 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -549,7 +549,7 @@ module_init(proc_hardware_init);
 
 void check_bugs(void)
 {
-#ifndef CONFIG_M68KFPU_EMU
+#if defined(CONFIG_FPU) && !defined(CONFIG_M68KFPU_EMU)
 	if (m68k_fputype == 0) {
 		pr_emerg("*** YOU DO NOT HAVE A FLOATING POINT UNIT, "
 			"WHICH IS REQUIRED BY LINUX/M68K ***\n");