The patch titled hibernation should work ok with memory hotplug has been added to the -mm tree. Its filename is hibernation-should-work-ok-with-memory-hotplug.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hibernation should work ok with memory hotplug From: Pavel Machek <pavel@xxxxxxx> hibernation + memory hotplug was disabled in kconfig because we could not handle hibernation + sparse mem at some point. It seems to work now, so I guess we can enable it. Signed-off-by: Pavel Machek <pavel@xxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Matt Tolentino <matthew.e.tolentino@xxxxxxxxx> Cc: Dave Hansen <haveblue@xxxxxxxxxx> Cc: Yasunori Goto <y-goto@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/Kconfig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff -puN mm/Kconfig~hibernation-should-work-ok-with-memory-hotplug mm/Kconfig --- a/mm/Kconfig~hibernation-should-work-ok-with-memory-hotplug +++ a/mm/Kconfig @@ -128,12 +128,9 @@ config SPARSEMEM_VMEMMAP config MEMORY_HOTPLUG bool "Allow for memory hot-add" depends on SPARSEMEM || X86_64_ACPI_NUMA - depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG + depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG depends on (IA64 || X86 || PPC64 || SUPERH || S390) -comment "Memory hotplug is currently incompatible with Software Suspend" - depends on SPARSEMEM && HOTPLUG && HIBERNATION - config MEMORY_HOTPLUG_SPARSE def_bool y depends on SPARSEMEM && MEMORY_HOTPLUG _ Patches currently in -mm which might be from pavel@xxxxxxx are linux-next.patch hibernation-should-work-ok-with-memory-hotplug.patch lis3lv02dx-accelerometer-driver.patch lis3lv02dx-accelerometer-driver-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html