From f693ba0684ee14300243507b4bec56e00f2452d6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Jan 2008 13:33:25 +0100 Subject: [PATCH] --- yaml --- r: 80367 b: refs/heads/master c: c84d6af881be84687fa924f16b2f4b4690354165 h: refs/heads/master i: 80365: a1de9879ae932ffefdafbcb1504a603abfa053d5 80363: 439e172815236eaeabd82e32661330017a942280 80359: 0e7913a4404bc779d6e41396e9072e8dc0e9bd7d 80351: efd00d8ae55d16c097c942516c5adfd5f83b99b6 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/reboot.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4bb45170025e..94360d518b7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08b6d290f977d8145804fd2b9bc2c331f2484f8e +refs/heads/master: c84d6af881be84687fa924f16b2f4b4690354165 diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c index 5b32f0b4d133..5818dc28167d 100644 --- a/trunk/arch/x86/kernel/reboot.c +++ b/trunk/arch/x86/kernel/reboot.c @@ -319,9 +319,11 @@ static inline void kb_wait(void) { int i; - for (i = 0; i < 0x10000; i++) - if ((inb_p(0x64) & 0x02) == 0) + for (i = 0; i < 0x10000; i++) { + if ((inb(0x64) & 0x02) == 0) break; + udelay(2); + } } void machine_emergency_restart(void)