https://github.com/torvalds/linux
Revision 6ad696d2cf535772dff659298ec7e7260e344595 authored by Andi Kleen on 17 November 2009, 22:06:22 UTC, committed by Linus Torvalds on 18 November 2009, 01:40:33 UTC
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: Andi 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: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 9398180
Tip revision: 6ad696d2cf535772dff659298ec7e7260e344595 authored by Andi Kleen on 17 November 2009, 22:06:22 UTC
mm: allow memory hotplug and hibernation in the same kernel
mm: allow memory hotplug and hibernation in the same kernel
Tip revision: 6ad696d
| File | Mode | Size |
|---|---|---|
| Documentation | ||
| arch | ||
| block | ||
| crypto | ||
| drivers | ||
| firmware | ||
| fs | ||
| include | ||
| init | ||
| ipc | ||
| kernel | ||
| lib | ||
| mm | ||
| net | ||
| samples | ||
| scripts | ||
| security | ||
| sound | ||
| tools | ||
| usr | ||
| virt | ||
| .gitignore | -rw-r--r-- | 952 bytes |
| .mailmap | -rw-r--r-- | 3.9 KB |
| COPYING | -rw-r--r-- | 18.3 KB |
| CREDITS | -rw-r--r-- | 91.8 KB |
| Kbuild | -rw-r--r-- | 2.4 KB |
| MAINTAINERS | -rw-r--r-- | 156.2 KB |
| Makefile | -rw-r--r-- | 53.9 KB |
| README | -rw-r--r-- | 17.0 KB |
| REPORTING-BUGS | -rw-r--r-- | 3.3 KB |
Computing file changes ...
