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();