1 files changed, 25 insertions, 4 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3bf72cd2c8fc..a4e3a93bf2d4 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -312,6 +312,26 @@ config MATH_EMULATION
           such as fsqrt on cores that do have an FPU but do not implement
           them (such as Freescale BookE).
 
+choice
+        prompt "Math emulation options"
+        default MATH_EMULATION_FULL
+        depends on MATH_EMULATION
+
+config  MATH_EMULATION_FULL
+        bool "Emulate all the floating point instructions"
+        ---help---
+          Select this option will enable the kernel to support to emulate
+          all the floating point instructions. If your SoC doesn't have
+          a FPU, you should select this.
+
+config MATH_EMULATION_HW_UNIMPLEMENTED
+        bool "Just emulate the FPU unimplemented instructions"
+        ---help---
+          Select this if you know there does have a hardware FPU on your
+          SoC, but some floating point instructions are not implemented by that.
+
+endchoice
+
 config PPC_TRANSACTIONAL_MEM
        bool "Transactional Memory support for POWERPC"
        depends on PPC_BOOK3S_64
@@ -369,9 +389,9 @@ config KEXEC
 
           It is an ongoing process to be certain the hardware in a machine
           is properly shutdown, so do not be surprised if this code does not
-          initially work for you.  It may help to enable device hotplugging
-          support.  As of this writing the exact hardware interface is
-          strongly in flux, so no good recommendation can be made.
+          initially work for you.  As of this writing the exact hardware
+          interface is strongly in flux, so no good recommendation can be
+          made.
 
 config CRASH_DUMP
         bool "Build a kdump crash kernel"
@@ -566,7 +586,7 @@ config SCHED_SMT
 config PPC_DENORMALISATION
         bool "PowerPC denormalisation exception handling"
         depends on PPC_BOOK3S_64
-        default "n"
+        default "y" if PPC_POWERNV
         ---help---
           Add support for handling denormalisation of single precision
           values.  Useful for bare metal only.  If unsure say Y here.
@@ -979,6 +999,7 @@ config RELOCATABLE
           must live at a different physical address than the primary
           kernel.
 
+# This value must have zeroes in the bottom 60 bits otherwise lots will break
 config PAGE_OFFSET
         hex
         default "0xc000000000000000"