From: J William Piggott <elseifthen@gmx.com>
Date: Wed, 14 Jan 2015 01:29:21 +0000 (-0500)
Subject: hwclock: remove automatic ISA fallback
X-Git-Tag: v2.26-rc1~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97c9060b92a1064e192dd0234f4bb0bcced12bda;p=thirdparty%2Futil-linux.git

hwclock: remove automatic ISA fallback

The old behavior when hwclock was unable to access
the rtc device was to fallback to direct ISA I/O.

This was sometimes allowing two processes to access
the Hardware Clock at the same time and hanging the
system. This is the reason the rtc device driver
only allows one process to open it.

Now hwclock defaults to using the rtc device and only
uses direct ISA when that option is given.

Signed-off-by: J William Piggott <elseifthen@gmx.com>
---

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index ca61a917dd..9000c95b9c 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1243,13 +1243,6 @@ static void determine_clock_access_method(const bool user_requests_ISA)
 		ur = probe_for_rtc_clock();
 #endif
 
-#if defined(__alpha__)
-	/* CMOS is also available for x86_64 and i386, 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)
 			puts(_(ur->interface_name));