From f05021c098af166c55ce5c6278df072337c84eb9 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Fri, 6 Feb 2009 13:38:51 -0800
Subject: [PATCH] --- yaml --- r: 136863 b: refs/heads/master c:
 3d39e9d07b576ee72f2c94cfad9e618fe21763b2 h: refs/heads/master i:   136861:
 f89785ec6a45584d7197de7a95b00f43ba04ad10   136859:
 d8530c2c6bc92ad54c2d06ded4c07b8bee9e7269   136855:
 9f58e563d0e97cb38827a37de17f02acef4d193d   136847:
 090ffaaf17b715f63f4ca65f54b8b59a677d415e   136831:
 e57296acbd4ebe52f69d6d9e3214406445263310 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/xen/multicalls.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)