---

yaml --- r: 176719 b: refs/heads/master c: dbd2918 h: refs/heads/master i: 176717: ec7ac54 176715: bae9230 176711: 1272055 176703: 213bff6 v: v3
git-mirror · Dec 16, 2009 · 5946c5a · 5946c5a
1 parent f28b0b6
commit 5946c5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b87d67ff3dc042bee42f991858d6b121b3b3ca
+refs/heads/master: dbd2918ec65c35f36bb102c88eafe87be0552f6f
diff --git a/trunk/drivers/misc/sgi-xp/xpc_uv.c b/trunk/drivers/misc/sgi-xp/xpc_uv.c
@@ -1024,7 +1024,8 @@ xpc_make_first_contact_uv(struct xpc_partition *part)
 	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));