summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2013-02-21 00:40:08 +0000
committerimp <imp@FreeBSD.org>2013-02-21 00:40:08 +0000
commitc21cb04a9d81b636f6fbd1358fb124ae5006714e (patch)
tree2955bf4150812c65110c67e28bbc8d734faa0dfb
parent26f4dce86c237cae2b96b76e8c21e3e91da040b6 (diff)
downloadFreeBSD-src-c21cb04a9d81b636f6fbd1358fb124ae5006714e.zip
FreeBSD-src-c21cb04a9d81b636f6fbd1358fb124ae5006714e.tar.gz
Fix broken usage of splhigh() by removing it.
-rw-r--r--sys/x86/isa/atrtc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c
index 2980098..b42beac 100644
--- a/sys/x86/isa/atrtc.c
+++ b/sys/x86/isa/atrtc.c
@@ -328,7 +328,6 @@ static int
atrtc_gettime(device_t dev, struct timespec *ts)
{
struct clocktime ct;
- int s;
/* Look if we have a RTC present and the time is valid */
if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) {
@@ -338,11 +337,8 @@ atrtc_gettime(device_t dev, struct timespec *ts)
/* wait for time update to complete */
/* If RTCSA_TUP is zero, we have at least 244us before next update */
- s = splhigh();
- while (rtcin(RTC_STATUSA) & RTCSA_TUP) {
- splx(s);
- s = splhigh();
- }
+ while (rtcin(RTC_STATUSA) & RTCSA_TUP)
+ continue;
ct.nsec = 0;
ct.sec = readrtc(RTC_SEC);
ct.min = readrtc(RTC_MIN);
OpenPOWER on IntegriCloud