]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
hwclock: don't check CMOS automatically on x86_64
authorKarel Zak <kzak@redhat.com>
Tue, 13 Jan 2015 08:44:11 +0000 (09:44 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 13 Jan 2015 08:44:11 +0000 (09:44 +0100)
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>
sys-utils/hwclock.c

index a376516ff2c82dd9fdae7f4f813265c3e9ae67f5..88d1e3c9bb4798beff2a01807fb99b97bf07be20 100644 (file)
@@ -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)