lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: enable ACPI extended century handling for 32bit

Browse Source 
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>
This commit is contained in:
Andi Kleen
2008-02-09 16:17:01 +01:00
committed by Ingo Molnar
parent 068c9222d0
commit 45de707911
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/rtc.c
View File

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