Signed-off-by: Andrew Morton --- arch/x86_64/kernel/time.c | 9 +-------- 1 files changed, 1 insertion(+), 8 deletions(-) diff -puN arch/x86_64/kernel/time.c~x86_64-mm-reenable-cmos-warning arch/x86_64/kernel/time.c --- devel/arch/x86_64/kernel/time.c~x86_64-mm-reenable-cmos-warning 2006-02-27 20:57:51.000000000 -0800 +++ devel-akpm/arch/x86_64/kernel/time.c 2006-02-27 20:57:51.000000000 -0800 @@ -244,17 +244,10 @@ static void set_rtc_mmss(unsigned long n 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); _