diff options
| author |   Andi Kleen <ak@suse.de> | 2006-03-25 16:30:37 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 09:10:55 -0800 |
| commit | 28456edeff2ef9273c55cd12e4b193208717d4cd (patch) | |
| tree | 9a75fb0b2158a8db1cb29d6df0dafc85bd82526f | |
| parent | [PATCH] x86_64: Fix formatting in time.c (diff) | |
| download | linux-dev-28456edeff2ef9273c55cd12e4b193208717d4cd.tar.xz linux-dev-28456edeff2ef9273c55cd12e4b193208717d4cd.zip | |
[PATCH] x86_64: Reename CMOS update warning
Was disabled due to an old bug, long gone.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/x86_64/kernel/time.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index bb6cb83450b2..7f58fa682491 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -244,17 +244,10 @@ static void set_rtc_mmss(unsigned long nowtime) real_minutes += 30; /* correct for half hour time zone */ real_minutes %= 60; -#if 0 - /* AMD 8111 is a really bad time keeper and hits this regularly. - It probably was an attempt to avoid screwing up DST, but ignore - that for now. */ if (abs(real_minutes - cmos_minutes) >= 30) { printk(KERN_WARNING "time.c: can't update CMOS clock " "from %d to %d\n", cmos_minutes, real_minutes); - } else -#endif - - { + } else { BIN_TO_BCD(real_seconds); BIN_TO_BCD(real_minutes); CMOS_WRITE(real_seconds, RTC_SECONDS); |