From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

MEMORY_HOTREMOVE config option is selectable even it arch doesn't support it.
This fix it.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/ia64/Kconfig |    3 +++
 mm/Kconfig        |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff -puN arch/ia64/Kconfig~memory-unplug-v7-page-offline-fix arch/ia64/Kconfig
--- a/arch/ia64/Kconfig~memory-unplug-v7-page-offline-fix
+++ a/arch/ia64/Kconfig
@@ -305,6 +305,9 @@ config HOTPLUG_CPU
 config ARCH_ENABLE_MEMORY_HOTPLUG
 	def_bool y
 
+config ARCH_ENABLE_MEMORY_HOTREMOVE
+	def_bool y
+
 config SCHED_SMT
 	bool "SMT scheduler support"
 	depends on SMP
diff -puN mm/Kconfig~memory-unplug-v7-page-offline-fix mm/Kconfig
--- a/mm/Kconfig~memory-unplug-v7-page-offline-fix
+++ a/mm/Kconfig
@@ -141,7 +141,7 @@ config MEMORY_HOTPLUG_SPARSE
 
 config MEMORY_HOTREMOVE
 	bool "Allow for memory hot remove"
-	depends on MEMORY_HOTPLUG
+	depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE
 	depends on MIGRATION
 
 # Heavily threaded applications may benefit from splitting the mm-wide
_