The patch titled i386, x86-64: show that CONFIG_HOTPLUG_CPU is required for suspend on SMP has been removed from the -mm tree. Its filename was i386-x86-64-show-that-config_hotplug_cpu-is-required-for-suspend-on-smp.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: i386, x86-64: show that CONFIG_HOTPLUG_CPU is required for suspend on SMP From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxx> Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/i386/Kconfig | 2 +- arch/x86_64/Kconfig | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff -puN arch/i386/Kconfig~i386-x86-64-show-that-config_hotplug_cpu-is-required-for-suspend-on-smp arch/i386/Kconfig --- a/arch/i386/Kconfig~i386-x86-64-show-that-config_hotplug_cpu-is-required-for-suspend-on-smp +++ a/arch/i386/Kconfig @@ -891,7 +891,7 @@ config PHYSICAL_ALIGN Don't change this unless you know what you are doing. 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 ---help--- Say Y here to experiment with turning CPUs off and on, and to diff -puN arch/x86_64/Kconfig~i386-x86-64-show-that-config_hotplug_cpu-is-required-for-suspend-on-smp arch/x86_64/Kconfig --- a/arch/x86_64/Kconfig~i386-x86-64-show-that-config_hotplug_cpu-is-required-for-suspend-on-smp +++ a/arch/x86_64/Kconfig @@ -428,12 +428,15 @@ config NR_CPUS memory in the static kernel configuration. 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 help Say Y here to experiment with turning CPUs off and on. CPUs 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 def_bool y _ Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are git-ieee1394.patch git-scsi-misc.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