From: sos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Date: Fri, 19 Aug 2005 15:47:19 +0000 (+0000)
Subject: Merge.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16891
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=df3303d149e9009eb7a5f8fb733a9e89269f1f3d;p=xen.git

Merge.

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

df3303d149e9009eb7a5f8fb733a9e89269f1f3d
diff --cc linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h
index 62c0575960,e57c54769a..b382e66182
--- a/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;
  }
  
 +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)
-         : "memory" );
++        : __syscall_clobber );
 +
 +    return ret;
 +}
 +
  #endif /* __HYPERCALL_H__ */