From b5af7fd54cb724273e8f8982b14ca078c5815347 Mon Sep 17 00:00:00 2001 From: Cliff Wickman Date: Wed, 2 Jun 2010 16:22:02 -0500 Subject: [PATCH] --- yaml --- r: 209235 b: refs/heads/master c: 7fba1bcd4844a4a8619a03bf51cabc92aea365a8 h: refs/heads/master i: 209233: 6c0ff2fde07208a4642d5938fec92e7a9642fc70 209231: 937b17ec6aac0ac2686dd43e3a5a371f2b81ea22 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tlb_uv.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index d934f496a869..b5d8b8c5f7cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90cc7d944981a6d06b49bb26fde1b490e28c90e5 +refs/heads/master: 7fba1bcd4844a4a8619a03bf51cabc92aea365a8 diff --git a/trunk/arch/x86/kernel/tlb_uv.c b/trunk/arch/x86/kernel/tlb_uv.c index dc962b5ac870..4cb14dbd7fa3 100644 --- a/trunk/arch/x86/kernel/tlb_uv.c +++ b/trunk/arch/x86/kernel/tlb_uv.c @@ -580,23 +580,10 @@ const struct cpumask *uv_flush_send_and_wait(struct bau_desc *bau_desc, } time1 = get_cycles(); do { - /* - * Every message from any given cpu gets a unique message - * sequence number. But retries use that same number. - * Our message may have timed out at the destination because - * all sw-ack resources are in use and there is a timeout - * pending there. In that case, our last send never got - * placed into the queue and we need to persist until it - * does. - * - * Make any retry a type MSG_RETRY so that the destination will - * free any resource held by a previous message from this cpu. - */ if (try == 0) { - /* use message type set by the caller the first time */ + bau_desc->header.msg_type = MSG_REGULAR; seq_number = bcp->message_number++; } else { - /* use RETRY type on all the rest; same sequence */ bau_desc->header.msg_type = MSG_RETRY; stat->s_retry_messages++; }