• Andi Kleen's avatar
    mm: allow memory hotplug and hibernation in the same kernel · 6ad696d2
    Andi Kleen authored
    Allow memory hotplug and hibernation in the same kernel
    
    Memory hotplug and hibernation were exclusive in Kconfig.  This is
    obviously a problem for distribution kernels who want to support both in
    the same image.
    
    After some discussions with Rafael and others the only problem is with
    parallel memory hotadd or removal while a hibernation operation is in
    process.  It was also working for s390 before.
    
    This patch removes the Kconfig level exclusion, and simply makes the
    memory add / remove functions grab the pm_mutex to exclude against
    hibernation.
    
    Fixes a regression - old kernels didn't exclude memory hotadd and
    hibernation.
    Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
    Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
    Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    6ad696d2
Kconfig 9.27 KB