From 57a91718612d9e3bb113873af84379a03e23a48e Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 26 Jul 2005 12:14:16 -0600
Subject: [PATCH] --- yaml --- r: 5059 b: refs/heads/master c:
 0963aba54aa26c89114dca7257acf8c938bfec8a h: refs/heads/master i:   5057:
 6b9a9f9c98ed6d8190ab9abd338b54a56d55dcfa   5055:
 ffe914b48f816c07b71911b4937de2ce100892ce v: v3

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

diff --git a/[refs] b/[refs]
index b40d69ed9464..30532fea3948 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 910de55c6653d76f90380c80f0b7a395f12019e3
+refs/heads/master: 0963aba54aa26c89114dca7257acf8c938bfec8a
diff --git a/trunk/arch/x86_64/kernel/reboot.c b/trunk/arch/x86_64/kernel/reboot.c
index 3d1cc09406a6..47f95687905f 100644
--- a/trunk/arch/x86_64/kernel/reboot.c
+++ b/trunk/arch/x86_64/kernel/reboot.c
@@ -153,6 +153,9 @@ void machine_halt(void)
 
 void machine_power_off(void)
 {
+	if (!reboot_force) {
+		machine_shutdown();
+	}
 	if (pm_power_off)
 		pm_power_off();
 }