projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40bb4af
)
x86: acpi: Fix reboot attempt sequence.
author
Keir Fraser
<keir@xen.org>
Fri, 10 Dec 2010 16:40:05 +0000
(16:40 +0000)
committer
Keir Fraser
<keir@xen.org>
Fri, 10 Dec 2010 16:40:05 +0000
(16:40 +0000)
Signed-off-by: Keir Fraser <keir@xen.org>
xen/arch/x86/shutdown.c
patch
|
blob
|
history
diff --git
a/xen/arch/x86/shutdown.c
b/xen/arch/x86/shutdown.c
index 7fbc33e485c0dfcd49754851d15af36dc617857e..c8821ed0a17ee6560e9e1e173002a48446415e4b 100644
(file)
--- a/
xen/arch/x86/shutdown.c
+++ b/
xen/arch/x86/shutdown.c
@@
-358,7
+358,7
@@
void machine_restart(unsigned int delay_millisecs)
* 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: