From b735c777ce04aab37829f1b85e41a1aea5f5850e Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 9 Feb 2008 16:16:59 +0100
Subject: [PATCH] --- yaml --- r: 88583 b: refs/heads/master c:
 068c9222d0206e8a6a905efeb9f4fe8dde8b5ff5 h: refs/heads/master i:   88581:
 e45f01ba8ea6bf71173dada904411338bb0163d9   88579:
 9ce80f5fdea428be58e7f1cbb81950a968a5a40c   88575:
 31b55bb28847f0b8de9f1d58e93870aa107f8db4 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/rtc.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 679babc2d8e5..7853102a0aa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b62576a2f53ad7edf604fedba0da1d4329749b7d
+refs/heads/master: 068c9222d0206e8a6a905efeb9f4fe8dde8b5ff5
diff --git a/trunk/arch/x86/kernel/rtc.c b/trunk/arch/x86/kernel/rtc.c
index d2569513ad4c..d4d8277e890e 100644
--- a/trunk/arch/x86/kernel/rtc.c
+++ b/trunk/arch/x86/kernel/rtc.c
@@ -94,7 +94,7 @@ int mach_set_rtc_mmss(unsigned long nowtime)
 
 unsigned long mach_get_cmos_time(void)
 {
-	unsigned int year, mon, day, hour, min, sec, century = 0;
+	unsigned int status, year, mon, day, hour, min, sec, century = 0;
 
 	/*
 	 * If UIP is clear, then we have >= 244 microseconds before
@@ -119,7 +119,10 @@ unsigned long mach_get_cmos_time(void)
 		century = CMOS_READ(acpi_gbl_FADT.century);
 #endif
 
-	if (RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)) {
+	status = CMOS_READ(RTC_CONTROL);
+	WARN_ON_ONCE((RTC_ALWAYS_BCD && (status & RTC_DM_BINARY));
+
+	if (RTC_ALWAYS_BCD || !(status & RTC_DM_BINARY)) {
 		BCD_TO_BIN(sec);
 		BCD_TO_BIN(min);
 		BCD_TO_BIN(hour);