[XEN] Fix 10362 change to create_grant_va_mapping().

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 4a7b4606632ed3c8e6b7090c06f19bf7c0a6f087..18a290ab13b96e982b73dbb3cfed289fc8a2a014 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -2419,13 +2419,9 @@ static int create_grant_pte_mapping(
     ol1e = *(l1_pgentry_t *)va;
     if ( !update_l1e(va, ol1e, _nl1e) )
     {
-#ifndef PTE_UPDATE_WITH_CMPXCHG
-        BUG();
-#else
         put_page_type(page);
         rc = GNTST_general_error;
         goto failed;
-#endif
     } 
 
     put_page_from_l1e(ol1e, d);
@@ -2543,13 +2539,7 @@ static int create_grant_va_mapping(
 
     if ( unlikely(__copy_from_user(&ol1e, pl1e, sizeof(ol1e)) != 0) ||
          !update_l1e(pl1e, ol1e, _nl1e) )
-    {
-#ifndef PTE_UPDATE_WITH_CMPXCHG
-        BUG();
-#else
         return GNTST_general_error;
-#endif
-    }
 
     put_page_from_l1e(ol1e, d);