From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Sat, 18 Dec 2010 01:20:25 +0000 (-0800)
Subject: xen/multicalls: add unlikely around slowpath in __xen_mc_entry()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b;p=mv-sheeva.git

xen/multicalls: add unlikely around slowpath in __xen_mc_entry()

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c
index 3001162c4bc..cc71f7cf1ad 100644
--- a/arch/x86/xen/multicalls.c
+++ b/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();