[Xen-changelog] [xen-unstable] [XEN] Fix 10362 change to create_grant_va_mapping().

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxxxx
# Node ID 61a81fab2a029f029420a7dc0c2f73b783b45729
# Parent  9d46e53c75f7598ab25b76b7a491801d1b320f5f
[XEN] Fix 10362 change to create_grant_va_mapping().
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm.c |   10 ----------
 1 files changed, 10 deletions(-)

diff -r 9d46e53c75f7 -r 61a81fab2a02 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri Jun 16 15:22:03 2006 +0100
+++ b/xen/arch/x86/mm.c Fri Jun 16 15:34:21 2006 +0100
@@ -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);
 

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