From f28b0b63fadc1b127f78ed1a59cc2183a51ed959 Mon Sep 17 00:00:00 2001
From: Robin Holt <holt@sgi.com>
Date: Tue, 15 Dec 2009 16:47:57 -0800
Subject: [PATCH] --- yaml --- r: 176718 b: refs/heads/master c:
 15b87d67ff3dc042bee42f991858d6b121b3b3ca h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/misc/sgi-xp/xpc_uv.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 732a8a629075..f40aa8a6dc77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2c9f115741453715d6b4da1cd2de65af8c7ad86
+refs/heads/master: 15b87d67ff3dc042bee42f991858d6b121b3b3ca
diff --git a/trunk/drivers/misc/sgi-xp/xpc_uv.c b/trunk/drivers/misc/sgi-xp/xpc_uv.c
index bbf0e2ee6fd9..19bd7b0ede91 100644
--- a/trunk/drivers/misc/sgi-xp/xpc_uv.c
+++ b/trunk/drivers/misc/sgi-xp/xpc_uv.c
@@ -949,11 +949,13 @@ xpc_get_fifo_entry_uv(struct xpc_fifo_head_uv *head)
 		head->first = first->next;
 		if (head->first == NULL)
 			head->last = NULL;
+
+		head->n_entries--;
+		BUG_ON(head->n_entries < 0);
+
+		first->next = NULL;
 	}
-	head->n_entries--;
-	BUG_ON(head->n_entries < 0);
 	spin_unlock_irqrestore(&head->lock, irq_flags);
-	first->next = NULL;
 	return first;
 }