diff options
| author | Andi Kleen <ak@suse.de> | 2008-02-09 16:17:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:45 +0200 |
| commit | 45de70791165ce7eac5232ed5a7c31152567f4da (patch) | |
| tree | 3b9012f8e548fbb73af0cb0a02ff0e4e24ade23b /arch/x86/kernel/rtc.c | |
| parent | 068c9222d0206e8a6a905efeb9f4fe8dde8b5ff5 (diff) | |
| download | linux-stable-45de70791165ce7eac5232ed5a7c31152567f4da.tar.gz linux-stable-45de70791165ce7eac5232ed5a7c31152567f4da.tar.bz2 linux-stable-45de70791165ce7eac5232ed5a7c31152567f4da.zip | |
x86: enable ACPI extended century handling for 32bit
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>
Diffstat (limited to 'arch/x86/kernel/rtc.c')
| -rw-r--r-- | arch/x86/kernel/rtc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index d4d8277e890e..91492190ac72 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -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); |