From 5946c5a13247006e7ec5e6c01ccb95d12ce44add Mon Sep 17 00:00:00 2001 From: Robin Holt Date: Tue, 15 Dec 2009 16:47:58 -0800 Subject: [PATCH] --- yaml --- r: 176719 b: refs/heads/master c: dbd2918ec65c35f36bb102c88eafe87be0552f6f h: refs/heads/master i: 176717: ec7ac548d1273a1ef36b334ef701b8e3c82f86c2 176715: bae9230744541e192c43efdcc769c07ee9b84343 176711: 12720557095321254db83fdc44167581ab7249d3 176703: 213bff6f7d5c4aff0146aa1d7470a29f0ccd8d9d v: v3 --- [refs] | 2 +- trunk/drivers/misc/sgi-xp/xpc_uv.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f40aa8a6dc77..7fa049f7b129 100644 --- 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 index 19bd7b0ede91..241ea5f01aaa 100644 --- 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));