From f7a56a73550ecf235fbf417c5110f134bca45261 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 30 Apr 2008 00:53:58 -0700
Subject: [PATCH] --- yaml --- r: 95215 b: refs/heads/master c:
 ac0e4b7d319bf284bb64bc7e1c051417386b34a4 h: refs/heads/master i:   95213:
 473cb4fc925fd25109ca327843065d33dcc58cdd   95211:
 1ef41c00271f31190a37f046c912ef237b4f6360   95207:
 3f8ef0408348f56b75b2e8dc72f9dacccb4bebb0   95199:
 fdbfb754f5d7b3d453d23965f152cd6c6ed84307 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/ds1286.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a44bb7c112c8..d4d7cbff4e13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6f6341a6475eb7f9c2b948a7d0fd56fd16ad675
+refs/heads/master: ac0e4b7d319bf284bb64bc7e1c051417386b34a4
diff --git a/trunk/drivers/char/ds1286.c b/trunk/drivers/char/ds1286.c
index 59146e3365ba..ea35ab2c9909 100644
--- a/trunk/drivers/char/ds1286.c
+++ b/trunk/drivers/char/ds1286.c
@@ -39,6 +39,7 @@
 #include <linux/spinlock.h>
 #include <linux/bcd.h>
 #include <linux/proc_fs.h>
+#include <linux/jiffies.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -451,7 +452,7 @@ static void ds1286_get_time(struct rtc_time *rtc_tm)
 	 */
 
 	if (ds1286_is_updating() != 0)
-		while (jiffies - uip_watchdog < 2*HZ/100)
+		while (time_before(jiffies, uip_watchdog + 2*HZ/100))
 			barrier();
 
 	/*