aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/rtc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 5c3142b6f1fc..e2ec2ee4cf79 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -88,6 +88,7 @@
88 88
89#ifdef CONFIG_SPARC32 89#ifdef CONFIG_SPARC32
90#include <linux/pci.h> 90#include <linux/pci.h>
91#include <linux/jiffies.h>
91#include <asm/ebus.h> 92#include <asm/ebus.h>
92 93
93static unsigned long rtc_port; 94static unsigned long rtc_port;
@@ -1316,7 +1317,8 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
1316 * Once the read clears, read the RTC time (again via ioctl). Easy. 1317 * Once the read clears, read the RTC time (again via ioctl). Easy.
1317 */ 1318 */
1318 1319
1319 while (rtc_is_updating() != 0 && jiffies - uip_watchdog < 2*HZ/100) 1320 while (rtc_is_updating() != 0 &&
1321 time_before(jiffies, uip_watchdog + 2*HZ/100))
1320 cpu_relax(); 1322 cpu_relax();
1321 1323
1322 /* 1324 /*