Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14214
b: refs/heads/master
c: a6f5deb
h: refs/heads/master
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Nov 15, 2005
1 parent 0f41c84 commit b02843d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b0918758dd68d6b8d01318a5200b65b9209760d
refs/heads/master: a6f5deb2be4c82f24fefadcbf7e448f540c05ae6
2 changes: 1 addition & 1 deletion trunk/arch/x86_64/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-i386/mach-default/mach_reboot.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit b02843d

Please sign in to comment.