1 files changed, 10 insertions, 3 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index 332f5c29b53a..8f5b45615f7b 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -115,7 +115,8 @@ config SPARSEMEM_EXTREME
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
         bool "Allow for memory hot-add"
-        depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND
+        depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG
+        depends on (IA64 || X86 || PPC64)
 
 comment "Memory hotplug is currently incompatible with Software Suspend"
         depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
@@ -138,10 +139,16 @@ config SPLIT_PTLOCK_CPUS
 #
 config MIGRATION
         bool "Page migration"
-        def_bool y if NUMA
-        depends on SWAP && NUMA
+        def_bool y
+        depends on NUMA
         help
           Allows the migration of the physical location of pages of processes
           while the virtual addresses are not changed. This is useful for
           example on NUMA systems to put pages nearer to the processors accessing
           the page.
+
+config RESOURCES_64BIT
+        bool "64 bit Memory and IO resources (EXPERIMENTAL)" if (!64BIT && EXPERIMENTAL)
+        default 64BIT
+        help
+          This option allows memory and IO resources to be 64 bit.