x86: enable ACPI extended century handling for 32bit
authorAndi Kleen <ak@suse.de>
Sat, 9 Feb 2008 15:17:01 +0000 (16:17 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:40:45 +0000 (17:40 +0200)
The extended century readout does not solve the year 2038 problem on
32bit!

v2: Fix compilation on !ACPI, pointed out by tglx

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/rtc.c

index d4d8277e890e12252d13400581d3951831bbbf7a..91492190ac7298c1a83a5f59b1a30dfcf43624d3 100644 (file)
@@ -112,15 +112,14 @@ unsigned long mach_get_cmos_time(void)
        mon = CMOS_READ(RTC_MONTH);
        year = CMOS_READ(RTC_YEAR);
 
-#if defined(CONFIG_ACPI) && defined(CONFIG_X86_64)
-       /* CHECKME: Is this really 64bit only ??? */
+#ifdef CONFIG_ACPI
        if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
            acpi_gbl_FADT.century)
                century = CMOS_READ(acpi_gbl_FADT.century);
 #endif
 
        status = CMOS_READ(RTC_CONTROL);
-       WARN_ON_ONCE((RTC_ALWAYS_BCD && (status & RTC_DM_BINARY));
+       WARN_ON_ONCE(RTC_ALWAYS_BCD && (status & RTC_DM_BINARY));
 
        if (RTC_ALWAYS_BCD || !(status & RTC_DM_BINARY)) {
                BCD_TO_BIN(sec);