Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ff47e23..30322b0 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1344,8 +1344,12 @@ config ARCH_SELECT_MEMORY_MODEL
        depends on ARCH_SPARSEMEM_ENABLE
 
 config ARCH_MEMORY_PROBE
-       def_bool y
+       bool "Enable sysfs memory/probe interface"
        depends on X86_64 && MEMORY_HOTPLUG
+       help
+         This option enables a sysfs memory/probe interface for testing.
+         See Documentation/memory-hotplug.txt for more information.
+         If you are unsure how to answer this question, answer N.
 
 config ARCH_PROC_KCORE_TEXT
        def_bool y
@@ -1716,9 +1720,10 @@ config X86_NEED_RELOCS
        depends on X86_32 && RELOCATABLE
 
 config PHYSICAL_ALIGN
-       hex "Alignment value to which kernel should be aligned" if X86_32
+       hex "Alignment value to which kernel should be aligned"
        default "0x1000000"
-       range 0x2000 0x1000000
+       range 0x2000 0x1000000 if X86_32
+       range 0x200000 0x1000000 if X86_64
        ---help---
          This value puts the alignment restrictions on physical address
          where kernel is loaded and run from. Kernel is compiled for an
@@ -1736,6 +1741,9 @@ config PHYSICAL_ALIGN
          end result is that kernel runs from a physical address meeting
          above alignment restrictions.
 
+         On 32-bit this value must be a multiple of 0x2000. On 64-bit
+         this value must be a multiple of 0x200000.
+
          Don't change this unless you know what you are doing.
 
 config HOTPLUG_CPU