ia64/xen-unstable

changeset 3146:c470392942a5

bitkeeper revision 1.1159.1.455 (41a61ff7up8G8qJyPAoWdgwg6BfRog)

sync w/ head.
author cl349@arcadians.cl.cam.ac.uk
date Thu Nov 25 18:09:59 2004 +0000 (2004-11-25)
parents ddf5b350364f
children 2a161976f1d7
files xen/arch/x86/memory.c xen/common/dom_mem_ops.c
line diff
     1.1 --- a/xen/arch/x86/memory.c	Thu Nov 25 18:04:18 2004 +0000
     1.2 +++ b/xen/arch/x86/memory.c	Thu Nov 25 18:09:59 2004 +0000
     1.3 @@ -1317,7 +1317,7 @@ int do_mmu_update(
     1.4              (void)get_user(done, pdone);
     1.5      }
     1.6  
     1.7 -    if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) )
     1.8 +    if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) ) {
     1.9          UNLOCK_BIGLOCK(d);
    1.10          return -EFAULT;
    1.11      }
     2.1 --- a/xen/common/dom_mem_ops.c	Thu Nov 25 18:04:18 2004 +0000
     2.2 +++ b/xen/common/dom_mem_ops.c	Thu Nov 25 18:09:59 2004 +0000
     2.3 @@ -22,14 +22,14 @@
     2.4   */
     2.5  #define START_EXTENT_SHIFT 4 /* op[:4] == start_extent */
     2.6  
     2.7 -#define PREEMPT_CHECK(_op)                          \
     2.8 -    if ( hypercall_preempt_check() ) {              \
     2.9 -        hypercall_create_continuation(              \
    2.10 -            __HYPERVISOR_dom_mem_op, 5,             \
    2.11 -            (_op) | (i << START_EXTENT_SHIFT),      \
    2.12 -            extent_list, nr_extents, extent_order,  \
    2.13 -            (d == current) ? DOMID_SELF : d->id);   \
    2.14 -        return __HYPERVISOR_dom_mem_op;             \
    2.15 +#define PREEMPT_CHECK(_op)                                  \
    2.16 +    if ( hypercall_preempt_check() ) {                      \
    2.17 +        hypercall_create_continuation(                      \
    2.18 +            __HYPERVISOR_dom_mem_op, 5,                     \
    2.19 +            (_op) | (i << START_EXTENT_SHIFT),              \
    2.20 +            extent_list, nr_extents, extent_order,          \
    2.21 +            (d == current->domain) ? DOMID_SELF : d->id);   \
    2.22 +        return __HYPERVISOR_dom_mem_op;                     \
    2.23      }
    2.24  
    2.25  static long