]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/suse-2.6.27.31/patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch
1 From: Pavel Machek <pavel@suse.cz>
2 Subject: mm: Do not disable memory hotplug when hibernation is enabled
3 References: bnc#438914
4
5 Signed-off-by: Rafael J. Wysocki <rjw@suse.de>
6
7 diff -ur linux/mm/Kconfig linux.tmp/mm/Kconfig
8 --- linux/mm/Kconfig 2008-10-27 10:10:59.000000000 +0100
9 +++ linux.tmp/mm/Kconfig 2008-10-29 10:02:41.000000000 +0100
10 @@ -128,12 +128,9 @@
11 config MEMORY_HOTPLUG
12 bool "Allow for memory hot-add"
13 depends on SPARSEMEM || X86_64_ACPI_NUMA
14 - depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG
15 + depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG
16 depends on (IA64 || X86 || PPC64 || SUPERH || S390)
17
18 -comment "Memory hotplug is currently incompatible with Software Suspend"
19 - depends on SPARSEMEM && HOTPLUG && HIBERNATION
20 -
21 config MEMORY_HOTPLUG_SPARSE
22 def_bool y
23 depends on SPARSEMEM && MEMORY_HOTPLUG