On Sun, 27 Nov 2005, Eric W. Biederman wrote:
> diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
> index 75235ed..57117b8 100644
> --- a/arch/x86_64/kernel/reboot.c
> +++ b/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();
> + }
> }
That makes sense, thanks Eric.
Zwane
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
