[Xen-changelog] [xen-unstable] x86/mm: change ASSERTs to BUG_ONs in mem_sharing.c

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1291805191 0
# Node ID 89116f28083f7d118a259c5bc684d1c4296d9cb3
# Parent  bfd13358b8bf3a6ca49702d773435a67f1ea5551
x86/mm: change ASSERTs to BUG_ONs in mem_sharing.c

These two ASSERTs have important side-effects so make them into BUG_ONs
consistent with the rest of the file.
Bug found by Jui-Hao Chiang <juihaochiang@xxxxxxxxx>.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 xen/arch/x86/mm/mem_sharing.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r bfd13358b8bf -r 89116f28083f xen/arch/x86/mm/mem_sharing.c
--- a/xen/arch/x86/mm/mem_sharing.c     Tue Dec 07 18:32:04 2010 +0000
+++ b/xen/arch/x86/mm/mem_sharing.c     Wed Dec 08 10:46:31 2010 +0000
@@ -545,7 +545,7 @@ int mem_sharing_nominate_page(struct p2m
          * it a few lines above.
          * The mfn needs to revert back to rw type. This should never fail,
          * since no-one knew that the mfn was temporarily sharable */
-        ASSERT(page_make_private(d, page) == 0);
+        BUG_ON(page_make_private(d, page) != 0);
         mem_sharing_hash_destroy(hash_entry);
         mem_sharing_gfn_destroy(gfn_info, 0);
         shr_unlock();
@@ -700,7 +700,7 @@ gfn_found:
     unmap_domain_page(s);
     unmap_domain_page(t);
 
-    ASSERT(set_shared_p2m_entry(p2m, gfn, page_to_mfn(page)) != 0);
+    BUG_ON(set_shared_p2m_entry(p2m, gfn, page_to_mfn(page)) == 0);
     put_page_and_type(old_page);
 
 private_page_found:    

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog