Add memory hotplug Kconfig options for x86-64 and a define introduced by the remove/migration merge. Signed-off-by: Matt Tolentino Signed-off-by: Dave Hansen --- memhotplug-dave/arch/x86_64/Kconfig | 9 +++++++++ memhotplug-dave/include/asm-x86_64/mman.h | 1 + 2 files changed, 10 insertions(+) diff -puN arch/x86_64/Kconfig~H4-memory_hotplug_Kconfig_options_and_define arch/x86_64/Kconfig --- memhotplug/arch/x86_64/Kconfig~H4-memory_hotplug_Kconfig_options_and_define 2004-12-10 13:52:48.000000000 -0800 +++ memhotplug-dave/arch/x86_64/Kconfig 2004-12-10 13:52:48.000000000 -0800 @@ -306,6 +306,15 @@ config ARCH_HAS_BOOTPA bool default y +config MEMORY_HOTPLUG + bool "Allow for memory hotplug" + depends on NONLINEAR && HOTPLUG && !NUMA + select MEMORY_MIGRATE + +config MEMORY_MIGRATE + bool "Memory migration" + default y if MEMORY_HOTPLUG + config HAVE_DEC_LOCK bool depends on SMP diff -puN include/asm-x86_64/mman.h~H4-memory_hotplug_Kconfig_options_and_define include/asm-x86_64/mman.h --- memhotplug/include/asm-x86_64/mman.h~H4-memory_hotplug_Kconfig_options_and_define 2004-12-10 13:52:48.000000000 -0800 +++ memhotplug-dave/include/asm-x86_64/mman.h 2004-12-10 13:52:48.000000000 -0800 @@ -23,6 +23,7 @@ #define MAP_NORESERVE 0x4000 /* don't check for reservations */ #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ #define MAP_NONBLOCK 0x10000 /* do not block on IO */ +#define MAP_IMMOVABLE 0x20000 #define MS_ASYNC 1 /* sync memory asynchronously */ #define MS_INVALIDATE 2 /* invalidate the caches */ _