diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-04-17 10:14:51 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-04-17 10:14:51 -0700 |
| commit | 71b264f85ff50c14fe945ffff06ae0d5e9a9124e (patch) | |
| tree | 9fd79c63fd630c4d030a97d254d42a3a73f1328b /arch/ia64/sn/kernel/xpc_partition.c | |
| parent | f4df39cbdd9e9ab615e80148cc271db22a8508ad (diff) | |
| parent | 072f042df335d7e0da2027637bcf720d7ff1589b (diff) | |
Pull miscellaneous into release branch
Conflicts:
arch/ia64/kernel/mca.c
Diffstat (limited to 'arch/ia64/sn/kernel/xpc_partition.c')
| -rw-r--r-- | arch/ia64/sn/kernel/xpc_partition.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c index 7ba403232cb8..9e97c2684832 100644 --- 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; } |