android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] x86_64: Fix get_cmos_time()

Browse Source 
Due to a broken condition, the body of the loop that is intended to wait for
the Update-In-Progress bit to get set and then cleared again was never
entered; in fact, the entire loop was optimized out by the compiler. Here is
a change to fix the condition (and to also move the initialization of locals
out of the spin lock protected region).

Signed-Off-By: Jan Beulich <jbeulich@novell.com>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jan Beulich 2006-01-11 22:46:42 +01:00 committed by Linus Torvalds
parent bdf2b1c9fe
commit 5329e13d0b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86_64/kernel/time.c
View File

@ -504,8 +504,8 @@ unsigned long long sched_clock(void)
static unsigned long get_cmos_time(void) static unsigned long get_cmos_time(void)
{ {
unsigned int timeout, year, mon, day, hour, min, sec; unsigned int timeout = 1000000, year, mon, day, hour, min, sec;
unsigned char last, this; unsigned char uip = 0, this = 0;
unsigned long flags; unsigned long flags;
/* /*
@ -518,11 +518,8 @@ static unsigned long get_cmos_time(void)
spin_lock_irqsave(&rtc_lock, flags); spin_lock_irqsave(&rtc_lock, flags);
timeout = 1000000; while (timeout && (!uip || this)) {
last = this = 0; uip |= this;
while (timeout && last && !this) {
last = this;
this = CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP; this = CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP;
timeout--; timeout--;
} }