From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Jan 2015 08:44:11 +0000 (+0100)
Subject: hwclock: don't check CMOS automatically on x86_64
X-Git-Tag: v2.26-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f109204b25b8102ed484267963bb6e2749f9dd8;p=thirdparty%2Futil-linux.git

hwclock: don't check CMOS automatically on x86_64

We have enabled CMOS also for x86_64, but it should be available only
if --directisa is explicitly specified.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index a376516ff2..88d1e3c9bb 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1243,8 +1243,12 @@ static void determine_clock_access_method(const bool user_requests_ISA)
 		ur = probe_for_rtc_clock();
 #endif
 
+#if defined(__i386__) || defined(__alpha__)
+	/* CMOS is also available for x86_64, but we don't check it automatically,
+	 * --directisa has to be excplicitly specified */
 	if (!ur && !user_requests_ISA)
 		ur = probe_for_cmos_clock();
+#endif
 
 	if (debug) {
 		if (ur)