mirror of https://gitee.com/openkylin/linux.git
i386, x86-64: show that CONFIG_HOTPLUG_CPU is required for suspend on SMP
It's not sufficiently documented that CONFIG_HOTPLUG_CPU is required for suspend/hibernation on SMP. Point out the non-obvious. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-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>
This commit is contained in:
parent
82cd0e8410
commit
1dbf37e8ad
|
@ -891,7 +891,7 @@ config PHYSICAL_ALIGN
|
||||||
Don't change this unless you know what you are doing.
|
Don't change this unless you know what you are doing.
|
||||||
|
|
||||||
config HOTPLUG_CPU
|
config HOTPLUG_CPU
|
||||||
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
|
bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
|
||||||
depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
|
depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
|
||||||
---help---
|
---help---
|
||||||
Say Y here to experiment with turning CPUs off and on, and to
|
Say Y here to experiment with turning CPUs off and on, and to
|
||||||
|
|
|
@ -428,12 +428,15 @@ config NR_CPUS
|
||||||
memory in the static kernel configuration.
|
memory in the static kernel configuration.
|
||||||
|
|
||||||
config HOTPLUG_CPU
|
config HOTPLUG_CPU
|
||||||
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
|
bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
|
||||||
depends on SMP && HOTPLUG && EXPERIMENTAL
|
depends on SMP && HOTPLUG && EXPERIMENTAL
|
||||||
help
|
help
|
||||||
Say Y here to experiment with turning CPUs off and on. CPUs
|
Say Y here to experiment with turning CPUs off and on. CPUs
|
||||||
can be controlled through /sys/devices/system/cpu/cpu#.
|
can be controlled through /sys/devices/system/cpu/cpu#.
|
||||||
Say N if you want to disable CPU hotplug.
|
This is also required for suspend/hibernation on SMP systems.
|
||||||
|
|
||||||
|
Say N if you want to disable CPU hotplug and don't need to
|
||||||
|
suspend.
|
||||||
|
|
||||||
config ARCH_ENABLE_MEMORY_HOTPLUG
|
config ARCH_ENABLE_MEMORY_HOTPLUG
|
||||||
def_bool y
|
def_bool y
|
||||||
|
|
Loading…
Reference in New Issue