Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk

diff --cc linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h
index 62c0575960d647885d00d5dfbc1686bf14b9bd64,e57c54769a34f83c42b96cd8dcbf9b54c2c570f5..b382e6618245197a4aaf3c402181d6bb7891a2fa
--- 1/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h
--- 2/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h
@@@ -502,21 -502,4 +502,21 @@@ HYPERVISOR_set_segment_base
      return ret;
  }
  
-         : "memory" );
 +static inline int
 +HYPERVISOR_vcpu_pickle(
 +    int vcpu, vcpu_guest_context_t *ctxt)
 +{
 +    int ret;
 +    unsigned long ign1, ign2;
 +    __asm__ __volatile__ (
 +        TRAP_INSTR
 +        : "=a" (ret), "=b" (ign1), "=c" (ign2)
 +      : "0" (__HYPERVISOR_sched_op),
 +        "1" (SCHEDOP_vcpu_pickle | (vcpu << SCHEDOP_vcpushift)),
 +        "2" (ctxt)
++        : __syscall_clobber );
 +
 +    return ret;
 +}
 +
  #endif /* __HYPERCALL_H__ */