---

yaml
---
r: 88583
b: refs/heads/master
c: 068c922
h: refs/heads/master
i:
  88581: e45f01b
  88579: 9ce80f5
  88575: 31b55bb
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b62576a2f53ad7edf604fedba0da1d4329749b7d
+refs/heads/master: 068c9222d0206e8a6a905efeb9f4fe8dde8b5ff5

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);