aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/sn/kernel/xpc_partition.c
diff options
context:
space:
mode:
authorDean Nelson <dcn@sgi.com>2005-12-22 14:32:56 -0600
committerTony Luck <tony.luck@intel.com>2006-01-13 10:16:36 -0800
commit246c7e33d51afe99890b2caab7ad482c0296d5ba (patch)
tree20d96a5182dd5971d9d51d6626cf02d4a1c19c85 /arch/ia64/sn/kernel/xpc_partition.c
parent7ae69d2aa4ed3ee8cef18a072346366f019d6a4a (diff)
[IA64-SGI] ensure XPC disengage request is processed
This patch fixes a problem in XPC disengage processing whereby it was not seeing the request to disengage from a remote partition, so the disengage wasn't happening. The disengagement is suppose to transpire during the time a XPC channel is disconnecting, and should be completed before the channel is declared to be disconnected. Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/xpc_partition.c')
-rw-r--r--arch/ia64/sn/kernel/xpc_partition.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c
index cdd6431853a..cf02a9bcd24 100644
--- a/arch/ia64/sn/kernel/xpc_partition.c
+++ b/arch/ia64/sn/kernel/xpc_partition.c
@@ -771,7 +771,8 @@ xpc_identify_act_IRQ_req(int nasid)
}
}
- if (!xpc_partition_disengaged(part)) {
+ if (part->disengage_request_timeout > 0 &&
+ !xpc_partition_disengaged(part)) {
/* still waiting on other side to disengage from us */
return;
}