[Xen-changelog] [xen-unstable] x86: acpi: Fix reboot attempt sequence.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1291999205 0
# Node ID 901c118b363e978566775f9d118b4f2f15598212
# Parent  91e0556f4d46bddb999c3c29b501b9620d7a5ee8
x86: acpi: Fix reboot attempt sequence.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
 xen/arch/x86/shutdown.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 91e0556f4d46 -r 901c118b363e xen/arch/x86/shutdown.c
--- a/xen/arch/x86/shutdown.c   Fri Dec 10 11:32:19 2010 +0000
+++ b/xen/arch/x86/shutdown.c   Fri Dec 10 16:40:05 2010 +0000
@@ -358,7 +358,7 @@ void machine_restart(unsigned int delay_
              * After this we revert to our usual sequence:
              *   KBD -> TRIPLE -> KBD -> TRIPLE -> KBD -> ...
              */
-            reboot_type = (((attempt == 0) && (orig_reboot_type == BOOT_ACPI))
+            reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI))
                            ? BOOT_ACPI : BOOT_TRIPLE);
             break;
         case BOOT_TRIPLE:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog