From: Karel Zak <kzak@redhat.com>
Date: Fri, 3 Aug 2018 11:08:21 +0000 (+0200)
Subject: hwclock: rely on kernel for RTC_UIE_ON on Aplha and Sparc
X-Git-Tag: v2.33-rc1~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0dcb713f2e2fe34756bab3c28e4d4ddec47afe1f;p=thirdparty%2Futil-linux.git

hwclock: rely on kernel for RTC_UIE_ON on Aplha and Sparc

It's kernel business to return EINVAL for unsupported RTC_UIE_ON. We
(userspace) should not make decisions about things that we do not
control.

If kernel is wrong then fix the kernel, don't hide the problem by
crazy ifdefs in userspace.

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

diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c
index 3b069d7aa3..32feb3504e 100644
--- a/sys-utils/hwclock-rtc.c
+++ b/sys-utils/hwclock-rtc.c
@@ -253,18 +253,9 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl)
 		warn(_("cannot open rtc device"));
 		return ret;
 	} else {
-		int rc;		/* Return code from ioctl */
 		/* Turn on update interrupts (one per second) */
-#if defined(__alpha__) || defined(__sparc__)
-		/*
-		 * Not all alpha kernels reject RTC_UIE_ON, but probably
-		 * they should.
-		 */
-		rc = -1;
-		errno = EINVAL;
-#else
-		rc = ioctl(rtc_fd, RTC_UIE_ON, 0);
-#endif
+		int rc = ioctl(rtc_fd, RTC_UIE_ON, 0);
+
 		if (rc != -1) {
 			/*
 			 * Just reading rtc_fd fails on broken hardware: no