[IA64-SGI] fixes for XPC disengage and open/close protocol

This patch addresses a few issues with the open/close protocol that
were revealed by the newly added disengage functionality combined
with more extensive testing.

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c
index 79a0fc4c860c..958488f55699 100644
--- a/arch/ia64/sn/kernel/xpc_partition.c
+++ b/arch/ia64/sn/kernel/xpc_partition.c
@@ -578,7 +578,7 @@ xpc_update_partition_info(struct xpc_partition *part, u8 remote_rp_version,
 
 
 /*
- * Prior code has determine the nasid which generated an IPI.  Inspect
+ * Prior code has determined the nasid which generated an IPI.  Inspect
  * that nasid to determine if its partition needs to be activated or
  * deactivated.
  *
@@ -942,14 +942,14 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
 
                 /* set a timelimit on the disengage request */
                 part->disengage_request_timeout = jiffies +
-                                        (XPC_DISENGAGE_REQUEST_TIMELIMIT * HZ);
+                                        (xpc_disengage_request_timelimit * HZ);
                 part->disengage_request_timer.expires =
                                         part->disengage_request_timeout;
                 add_timer(&part->disengage_request_timer);
         }
 
-        dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n", partid,
-                reason);
+        dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n",
+                XPC_PARTID(part), reason);
 
         xpc_partition_going_down(part, reason);
 }