ia64/xen-unstable

changeset 3157:d4bdc9cba180

bitkeeper revision 1.1159.183.17 (41a658bbIArZMuBZetKe-ymRRomjaw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Nov 25 22:12:11 2004 +0000 (2004-11-25)
parents 47c22f37b898 d0daec09aa8b
children 1bdaaf83e2ac 20290eb62e95
files xen/common/multicall.c
line diff
     1.1 --- a/xen/common/multicall.c	Thu Nov 25 21:06:45 2004 +0000
     1.2 +++ b/xen/common/multicall.c	Thu Nov 25 22:12:11 2004 +0000
     1.3 @@ -52,9 +52,15 @@ long do_multicall(multicall_entry_t *cal
     1.4  
     1.5          if ( hypercall_preempt_check() )
     1.6          {
     1.7 -            /* If the sub-call wasn't preempted, skip over it. */
     1.8 +            /*
     1.9 +             * Copy the sub-call continuation if it was preempted.
    1.10 +             * Otherwise skip over the sub-call entirely.
    1.11 +             */
    1.12              if ( !test_bit(_MCSF_call_preempted, &mcs->flags) )
    1.13                  i++;
    1.14 +            else
    1.15 +                (void)__copy_to_user(&call_list[i], &mcs->call,
    1.16 +                                     sizeof(*call_list));
    1.17  
    1.18              /* Only create a continuation if there is work left to be done. */
    1.19              if ( i < nr_calls )