From a99223195cc0c7577300eb53e052bb3d3eae48bf Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 11 Jan 2006 22:43:12 +0100
Subject: [PATCH] --- yaml --- r: 17942 b: refs/heads/master c:
 6e3fbee5f11a8135109b08bfcbc05a29eb4eabe8 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/i386/kernel/reboot.c   |  7 ++++---
 trunk/arch/x86_64/kernel/reboot.c | 10 ++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 1c14f45d4ab6..2e56afe634c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 329d400f47ddfe8ff599823d739c5c5565da3207
+refs/heads/master: 6e3fbee5f11a8135109b08bfcbc05a29eb4eabe8
diff --git a/trunk/arch/i386/kernel/reboot.c b/trunk/arch/i386/kernel/reboot.c
index 2fa5803a759d..d207242976d3 100644
--- a/trunk/arch/i386/kernel/reboot.c
+++ b/trunk/arch/i386/kernel/reboot.c
@@ -12,6 +12,7 @@
 #include <linux/efi.h>
 #include <linux/dmi.h>
 #include <linux/ctype.h>
+#include <linux/pm.h>
 #include <asm/uaccess.h>
 #include <asm/apic.h>
 #include <asm/desc.h>
@@ -355,10 +356,10 @@ void machine_halt(void)
 
 void machine_power_off(void)
 {
-	machine_shutdown();
-
-	if (pm_power_off)
+	if (pm_power_off) {
+		machine_shutdown();
 		pm_power_off();
+	}
 }
 
 
diff --git a/trunk/arch/x86_64/kernel/reboot.c b/trunk/arch/x86_64/kernel/reboot.c
index 75235ed2b31b..57117b8beb2b 100644
--- a/trunk/arch/x86_64/kernel/reboot.c
+++ b/trunk/arch/x86_64/kernel/reboot.c
@@ -6,6 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/pm.h>
 #include <asm/io.h>
 #include <asm/kdebug.h>
 #include <asm/delay.h>
@@ -154,10 +155,11 @@ void machine_halt(void)
 
 void machine_power_off(void)
 {
-	if (!reboot_force) {
-		machine_shutdown();
-	}
-	if (pm_power_off)
+	if (pm_power_off) {
+		if (!reboot_force) {
+			machine_shutdown();
+		}
 		pm_power_off();
+	}
 }