[IA64] Replace explicit jiffies tests with time_* macros.

In arch/ia64/sn/kernel/xpc_{main,partition}.c

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index 81785b78bc1ecc5e4c53053567d5bfffbc9aa230..9e0b164da9c27a3e040f113354a57b9f4de291fa 100644 (file)
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -199,7 +199,7 @@ xpc_timeout_partition_disengage_request(unsigned long data)
        struct xpc_partition *part = (struct xpc_partition *) data;
 
 
-       DBUG_ON(jiffies < part->disengage_request_timeout);
+       DBUG_ON(time_before(jiffies, part->disengage_request_timeout));
 
        (void) xpc_partition_disengaged(part);
 
@@ -230,7 +230,7 @@ xpc_hb_beater(unsigned long dummy)
 {
        xpc_vars->heartbeat++;
 
-       if (jiffies >= xpc_hb_check_timeout) {
+       if (time_after_eq(jiffies, xpc_hb_check_timeout)) {
                wake_up_interruptible(&xpc_act_IRQ_wq);
        }
 
@@ -270,7 +270,7 @@ xpc_hb_checker(void *ignore)
 
 
                /* checking of remote heartbeats is skewed by IRQ handling */
-               if (jiffies >= xpc_hb_check_timeout) {
+               if (time_after_eq(jiffies, xpc_hb_check_timeout)) {
                        dev_dbg(xpc_part, "checking remote heartbeats\n");
                        xpc_check_remote_hb();
 
@@ -305,7 +305,7 @@ xpc_hb_checker(void *ignore)
                /* wait for IRQ or timeout */
                (void) wait_event_interruptible(xpc_act_IRQ_wq,
                            (last_IRQ_count < atomic_read(&xpc_act_IRQ_rcvd) ||
-                                       jiffies >= xpc_hb_check_timeout ||
+                                       time_after_eq(jiffies, xpc_hb_check_timeout) ||
                                                (volatile int) xpc_exiting));
        }
 

diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c
index 7ba403232cb8321516bbbceb0cb8eeb841a467d8..9e97c2684832f6b408b3ca145659dc174edc153f 100644 (file)
--- a/arch/ia64/sn/kernel/xpc_partition.c
+++ b/arch/ia64/sn/kernel/xpc_partition.c
@@ -877,7 +877,7 @@ xpc_partition_disengaged(struct xpc_partition *part)
        disengaged = (xpc_partition_engaged(1UL << partid) == 0);
        if (part->disengage_request_timeout) {
                if (!disengaged) {
-                       if (jiffies < part->disengage_request_timeout) {
+                       if (time_before(jiffies, part->disengage_request_timeout)) {
                                /* timelimit hasn't been reached yet */
                                return 0;
                        }