From: kfraser@dhcp93.uk.xensource.com <kfraser@dhcp93.uk.xensource.com>
Date: Fri, 16 Jun 2006 14:34:21 +0000 (+0100)
Subject: [XEN] Fix 10362 change to create_grant_va_mapping().
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15921^2~56^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=583b822938305f2e1b30e2d056163310e0ee2f85;p=xen.git

[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 4a7b460663..18a290ab13 100644
--- 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);