From de3d54e75f5b20bef5dcff8275926111a21e864c Mon Sep 17 00:00:00 2001
From: Mark Lord <lkml@rtr.ca>
Date: Mon, 1 Oct 2007 01:20:10 -0700
Subject: [PATCH] --- yaml --- r: 65226 b: refs/heads/master c:
 4047727e5ae33f9b8d2b7766d1994ea6e5ec2991 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/kernel/sys.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3b325b621b60..a8744d239c5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 281e0e3b34acb76a157576d27abc85c09fcf78e3
+refs/heads/master: 4047727e5ae33f9b8d2b7766d1994ea6e5ec2991
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 1b33b05d346b..8ae2e636eb1b 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -32,6 +32,7 @@
 #include <linux/getcpu.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/seccomp.h>
+#include <linux/cpu.h>
 
 #include <linux/compat.h>
 #include <linux/syscalls.h>
@@ -878,6 +879,7 @@ void kernel_power_off(void)
 	kernel_shutdown_prepare(SYSTEM_POWER_OFF);
 	if (pm_power_off_prepare)
 		pm_power_off_prepare();
+	disable_nonboot_cpus();
 	sysdev_shutdown();
 	printk(KERN_EMERG "Power down.\n");
 	machine_power_off();