summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/multicalls.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-12-18 02:20:25 +0100
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-07-19 00:43:45 +0200
commit4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b (patch)
treeb3b7a7058c38d0dbce2f59c3a79704f86bd7cc13 /arch/x86/xen/multicalls.c
parentxen/multicalls: disable MC_DEBUG (diff)
downloadlinux-4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b.tar.xz
linux-4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b.zip
xen/multicalls: add unlikely around slowpath in __xen_mc_entry()
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86/xen/multicalls.c')
-rw-r--r--arch/x86/xen/multicalls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c
index 3001162c4bce..cc71f7cf1adc 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();