From ccdae8f89a1bf0ddbea8c9fa8ecfe603de15a87f Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Fri, 17 Dec 2010 17:20:25 -0800
Subject: [PATCH] --- yaml --- r: 257959 b: refs/heads/master c:
 4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b h: refs/heads/master i:   257957:
 e15e2b2dc723aa4f4d1d90b5d15b3cb5db7abda4   257955:
 4a238627d058e0757e118e88b6824b068b3cef92   257951:
 595348846ef02d934721424368afbaa0e2f4393d v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/xen/multicalls.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 40ec32e51f52..3c8f17b9e818 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc78767f2ac5b8007aeb366e748c8dd8b8bc3a3
+refs/heads/master: 4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b
diff --git a/trunk/arch/x86/xen/multicalls.c b/trunk/arch/x86/xen/multicalls.c
index 3001162c4bce..cc71f7cf1adc 100644
--- a/trunk/arch/x86/xen/multicalls.c
+++ b/trunk/arch/x86/xen/multicalls.c
@@ -123,8 +123,8 @@ struct multicall_space __xen_mc_entry(size_t args)
 	BUG_ON(preemptible());
 	BUG_ON(b->argidx >= MC_ARGS);
 
-	if (b->mcidx == MC_BATCH ||
-	    (argidx + args) >= MC_ARGS) {
+	if (unlikely(b->mcidx == MC_BATCH ||
+		     (argidx + args) >= MC_ARGS)) {
 		trace_xen_mc_flush_reason((b->mcidx == MC_BATCH) ?
 					  XEN_MC_FL_BATCH : XEN_MC_FL_ARGS);
 		xen_mc_flush();