projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] x86_64 sync machine_power_off with i386
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
reboot.c
diff --git
a/arch/x86_64/kernel/reboot.c
b/arch/x86_64/kernel/reboot.c
index
3d1cc09
..
47f9568
100644
(file)
--- a/
arch/x86_64/kernel/reboot.c
+++ b/
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();
}