projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: Use do_kernel_power_off()
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
reboot.c
diff --git
a/arch/x86/kernel/reboot.c
b/arch/x86/kernel/reboot.c
index
fa700b4
..
c3636ea
100644
(file)
--- a/
arch/x86/kernel/reboot.c
+++ b/
arch/x86/kernel/reboot.c
@@
-739,10
+739,10
@@
static void native_machine_halt(void)
static void native_machine_power_off(void)
{
static void native_machine_power_off(void)
{
- if (
pm_power_off
) {
+ if (
kernel_can_power_off()
) {
if (!reboot_force)
machine_shutdown();
if (!reboot_force)
machine_shutdown();
-
pm
_power_off();
+
do_kernel
_power_off();
}
/* A fallback in case there is no PM info available */
tboot_shutdown(TB_SHUTDOWN_HALT);
}
/* A fallback in case there is no PM info available */
tboot_shutdown(TB_SHUTDOWN_HALT);