From b02843da570659d25237e43ee4b898ec9cf94bf1 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 5 Nov 2005 17:25:54 +0100 Subject: [PATCH] --- yaml --- r: 14214 b: refs/heads/master c: a6f5deb2be4c82f24fefadcbf7e448f540c05ae6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/reboot.c | 2 +- trunk/include/asm-i386/mach-default/mach_reboot.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9a1a8f10fa3b..9bd398a375a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b0918758dd68d6b8d01318a5200b65b9209760d +refs/heads/master: a6f5deb2be4c82f24fefadcbf7e448f540c05ae6 diff --git a/trunk/arch/x86_64/kernel/reboot.c b/trunk/arch/x86_64/kernel/reboot.c index 97804bc2c0a0..75235ed2b31b 100644 --- a/trunk/arch/x86_64/kernel/reboot.c +++ b/trunk/arch/x86_64/kernel/reboot.c @@ -121,7 +121,7 @@ void machine_emergency_restart(void) /* Could also try the reset bit in the Hammer NB */ switch (reboot_type) { case BOOT_KBD: - for (i=0; i<100; i++) { + for (i=0; i<10; i++) { kb_wait(); udelay(50); outb(0xfe,0x64); /* pulse reset low */ diff --git a/trunk/include/asm-i386/mach-default/mach_reboot.h b/trunk/include/asm-i386/mach-default/mach_reboot.h index 06ae4d81ba6a..a955e57ad016 100644 --- a/trunk/include/asm-i386/mach-default/mach_reboot.h +++ b/trunk/include/asm-i386/mach-default/mach_reboot.h @@ -19,7 +19,7 @@ static inline void kb_wait(void) static inline void mach_reboot(void) { int i; - for (i = 0; i < 100; i++) { + for (i = 0; i < 10; i++) { kb_wait(); udelay(50); outb(0x60, 0x64); /* write Controller Command Byte */