Many times while the initial connection is being made, the contacted partition will send back both the ACTIVATING and the ACTIVE remote_act_state changes in very close succescion. The 1/4 second delay in the make first contact loop is large enough to nearly always miss the ACTIVATING state change. Since either state indicates the remote partition has acknowledged our state change, accept either. To: Ingo Molnar Signed-off-by: Robin Holt Cc: Jack Steiner Cc: lkml --- drivers/misc/sgi-xp/xpc_uv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-x86/drivers/misc/sgi-xp/xpc_uv.c =================================================================== --- linux-x86.orig/drivers/misc/sgi-xp/xpc_uv.c 2009-11-09 09:13:14.000000000 -0600 +++ linux-x86/drivers/misc/sgi-xp/xpc_uv.c 2009-11-09 09:13:14.000000000 -0600 @@ -1022,7 +1022,8 @@ xpc_make_first_contact_uv(struct xpc_par xpc_send_activate_IRQ_part_uv(part, &msg, sizeof(msg), XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV); - while (part->sn.uv.remote_act_state != XPC_P_AS_ACTIVATING) { + while (!((part->sn.uv.remote_act_state == XPC_P_AS_ACTIVATING) || + (part->sn.uv.remote_act_state == XPC_P_AS_ACTIVE))) { dev_dbg(xpc_part, "waiting to make first contact with " "partition %d\n", XPC_PARTID(part)); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/