From fc79ad5a2c4360a2ecc028a44cdffaa1634d7a14 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Dec 2007 13:20:32 +0800 Subject: [PATCH] Revert "Fix SMP poweroff hangs" This reverts the following changeset in 2.6.22.10 that caused a lot of reported problems. From: Mark Lord commit 4047727e5ae33f9b8d2b7766d1994ea6e5ec2991 from upstream We need to disable all CPUs other than the boot CPU (usually 0) before attempting to power-off modern SMP machines. This fixes the hang-on-poweroff issue on my MythTV SMP box, and also on Thomas Gleixner's new toybox. Signed-off-by: Mark Lord Acked-by: Thomas Gleixner Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman There still is a remaining shutdown problem in 2.6.22 with old APM based systems, but this fix is not the correct one Signed-off-by: Greg Kroah-Hartman --- kernel/sys.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/sys.c b/kernel/sys.c index afd9b93069f9..28e8364ad68a 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -866,7 +865,6 @@ EXPORT_SYMBOL_GPL(kernel_halt); void kernel_power_off(void) { kernel_shutdown_prepare(SYSTEM_POWER_OFF); - disable_nonboot_cpus(); printk(KERN_EMERG "Power down.\n"); machine_power_off(); } -- 2.39.5