aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/reboot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/kernel/reboot.c')
-rw-r--r--arch/x86_64/kernel/reboot.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 75235ed2b31b..57117b8beb2b 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -6,6 +6,7 @@
6#include <linux/kernel.h> 6#include <linux/kernel.h>
7#include <linux/ctype.h> 7#include <linux/ctype.h>
8#include <linux/string.h> 8#include <linux/string.h>
9#include <linux/pm.h>
9#include <asm/io.h> 10#include <asm/io.h>
10#include <asm/kdebug.h> 11#include <asm/kdebug.h>
11#include <asm/delay.h> 12#include <asm/delay.h>
@@ -154,10 +155,11 @@ void machine_halt(void)
154 155
155void machine_power_off(void) 156void machine_power_off(void)
156{ 157{
157 if (!reboot_force) { 158 if (pm_power_off) {
158 machine_shutdown(); 159 if (!reboot_force) {
159 } 160 machine_shutdown();
160 if (pm_power_off) 161 }
161 pm_power_off(); 162 pm_power_off();
163 }
162} 164}
163 165