summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-12-17 17:20:25 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-07-18 15:43:45 -0700
commit4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b (patch)
treeb3b7a7058c38d0dbce2f59c3a79704f86bd7cc13 /arch/x86/xen
parentffc78767f2ac5b8007aeb366e748c8dd8b8bc3a3 (diff)
downloadop-kernel-dev-4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b.zip
op-kernel-dev-4a7b005dbfa554e7cc7fbc08e0299a9b7a91ef3b.tar.gz
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')
-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 3001162..cc71f7c 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();
OpenPOWER on IntegriCloud