ia64/xen-unstable

changeset 2718:db83b3aaf89f

bitkeeper revision 1.1159.130.5 (4179350dKbV8Dl-DTyoBQ9c__K-pFw)

Fix incorrect error path in Xen's p.t. update code.
author kaf24@freefall.cl.cam.ac.uk
date Fri Oct 22 16:27:57 2004 +0000 (2004-10-22)
parents fa8f7b78d2c9
children bd93b9d866a5
files xen/arch/x86/memory.c
line diff
     1.1 --- a/xen/arch/x86/memory.c	Fri Oct 22 16:03:20 2004 +0000
     1.2 +++ b/xen/arch/x86/memory.c	Fri Oct 22 16:27:57 2004 +0000
     1.3 @@ -401,16 +401,9 @@ get_page_from_l1e(
     1.4          return 0;
     1.5      }
     1.6  
     1.7 -    if ( unlikely(!get_page_from_pagenr(pfn, d)) )
     1.8 -        return 0;
     1.9 -
    1.10 -    if ( l1v & _PAGE_RW )
    1.11 -    {
    1.12 -        if ( unlikely(!get_page_type(page, PGT_writable_page)) )
    1.13 -            return 0;
    1.14 -    }
    1.15 -
    1.16 -    return 1;
    1.17 +    return ((l1v & _PAGE_RW) ?
    1.18 +            get_page_and_type(page, d, PGT_writable_page) :
    1.19 +            get_page(d));
    1.20  }
    1.21  
    1.22