ia64/xen-unstable

changeset 10454:61a81fab2a02

[XEN] Fix 10362 change to create_grant_va_mapping().
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@dhcp93.uk.xensource.com
date Fri Jun 16 15:34:21 2006 +0100 (2006-06-16)
parents 9d46e53c75f7
children 05ab081f3c67
files xen/arch/x86/mm.c
line diff
     1.1 --- a/xen/arch/x86/mm.c	Fri Jun 16 15:22:03 2006 +0100
     1.2 +++ b/xen/arch/x86/mm.c	Fri Jun 16 15:34:21 2006 +0100
     1.3 @@ -2419,13 +2419,9 @@ static int create_grant_pte_mapping(
     1.4      ol1e = *(l1_pgentry_t *)va;
     1.5      if ( !update_l1e(va, ol1e, _nl1e) )
     1.6      {
     1.7 -#ifndef PTE_UPDATE_WITH_CMPXCHG
     1.8 -        BUG();
     1.9 -#else
    1.10          put_page_type(page);
    1.11          rc = GNTST_general_error;
    1.12          goto failed;
    1.13 -#endif
    1.14      } 
    1.15  
    1.16      put_page_from_l1e(ol1e, d);
    1.17 @@ -2543,13 +2539,7 @@ static int create_grant_va_mapping(
    1.18  
    1.19      if ( unlikely(__copy_from_user(&ol1e, pl1e, sizeof(ol1e)) != 0) ||
    1.20           !update_l1e(pl1e, ol1e, _nl1e) )
    1.21 -    {
    1.22 -#ifndef PTE_UPDATE_WITH_CMPXCHG
    1.23 -        BUG();
    1.24 -#else
    1.25          return GNTST_general_error;
    1.26 -#endif
    1.27 -    }
    1.28  
    1.29      put_page_from_l1e(ol1e, d);
    1.30