diff --git a/[refs] b/[refs]
index 7236a7bf1cc1..f6927b35df9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b93d51dc62a41b5c2d6f32a0870709dc0cc55545
+refs/heads/master: 3d39e9d07b576ee72f2c94cfad9e618fe21763b2
diff --git a/trunk/arch/x86/xen/multicalls.c b/trunk/arch/x86/xen/multicalls.c
index 82f2513e9758..6cffd5532b91 100644
--- a/trunk/arch/x86/xen/multicalls.c
+++ b/trunk/arch/x86/xen/multicalls.c
@@ -179,7 +179,7 @@ void xen_mc_flush(void)
 	}
 	b->cbidx = 0;
 
-	BUG_ON(ret);
+	WARN_ON(ret);
 }
 
 struct multicall_space __xen_mc_entry(size_t args)