aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-11-05 11:25:54 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-14 22:55:16 -0500
commita6f5deb2be4c82f24fefadcbf7e448f540c05ae6 (patch)
treef138057dbbd6bf08d52404e758f3db8502af1c29 /arch
parent2b0918758dd68d6b8d01318a5200b65b9209760d (diff)
[PATCH] x86_64: Reduce number of retries for reset through keyboard controller
Old code could retry for 10 seconds worst time. Only try it for one second now. Suggested by Yinghai Lu Cc: Yinghai.Lu@amd.com Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/reboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 97804bc2c0a0..75235ed2b31b 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -121,7 +121,7 @@ void machine_emergency_restart(void)
121 /* Could also try the reset bit in the Hammer NB */ 121 /* Could also try the reset bit in the Hammer NB */
122 switch (reboot_type) { 122 switch (reboot_type) {
123 case BOOT_KBD: 123 case BOOT_KBD:
124 for (i=0; i<100; i++) { 124 for (i=0; i<10; i++) {
125 kb_wait(); 125 kb_wait();
126 udelay(50); 126 udelay(50);
127 outb(0xfe,0x64); /* pulse reset low */ 127 outb(0xfe,0x64); /* pulse reset low */