diff options
Diffstat (limited to 'arch/ia64/sn/kernel/xpc_main.c')
-rw-r--r-- | arch/ia64/sn/kernel/xpc_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c index 81785b78bc1e..9e0b164da9c2 100644 --- 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) | |||
199 | struct xpc_partition *part = (struct xpc_partition *) data; | 199 | struct xpc_partition *part = (struct xpc_partition *) data; |
200 | 200 | ||
201 | 201 | ||
202 | DBUG_ON(jiffies < part->disengage_request_timeout); | 202 | DBUG_ON(time_before(jiffies, part->disengage_request_timeout)); |
203 | 203 | ||
204 | (void) xpc_partition_disengaged(part); | 204 | (void) xpc_partition_disengaged(part); |
205 | 205 | ||
@@ -230,7 +230,7 @@ xpc_hb_beater(unsigned long dummy) | |||
230 | { | 230 | { |
231 | xpc_vars->heartbeat++; | 231 | xpc_vars->heartbeat++; |
232 | 232 | ||
233 | if (jiffies >= xpc_hb_check_timeout) { | 233 | if (time_after_eq(jiffies, xpc_hb_check_timeout)) { |
234 | wake_up_interruptible(&xpc_act_IRQ_wq); | 234 | wake_up_interruptible(&xpc_act_IRQ_wq); |
235 | } | 235 | } |
236 | 236 | ||
@@ -270,7 +270,7 @@ xpc_hb_checker(void *ignore) | |||
270 | 270 | ||
271 | 271 | ||
272 | /* checking of remote heartbeats is skewed by IRQ handling */ | 272 | /* checking of remote heartbeats is skewed by IRQ handling */ |
273 | if (jiffies >= xpc_hb_check_timeout) { | 273 | if (time_after_eq(jiffies, xpc_hb_check_timeout)) { |
274 | dev_dbg(xpc_part, "checking remote heartbeats\n"); | 274 | dev_dbg(xpc_part, "checking remote heartbeats\n"); |
275 | xpc_check_remote_hb(); | 275 | xpc_check_remote_hb(); |
276 | 276 | ||
@@ -305,7 +305,7 @@ xpc_hb_checker(void *ignore) | |||
305 | /* wait for IRQ or timeout */ | 305 | /* wait for IRQ or timeout */ |
306 | (void) wait_event_interruptible(xpc_act_IRQ_wq, | 306 | (void) wait_event_interruptible(xpc_act_IRQ_wq, |
307 | (last_IRQ_count < atomic_read(&xpc_act_IRQ_rcvd) || | 307 | (last_IRQ_count < atomic_read(&xpc_act_IRQ_rcvd) || |
308 | jiffies >= xpc_hb_check_timeout || | 308 | time_after_eq(jiffies, xpc_hb_check_timeout) || |
309 | (volatile int) xpc_exiting)); | 309 | (volatile int) xpc_exiting)); |
310 | } | 310 | } |
311 | 311 | ||