From: kaf24@firebug.cl.cam.ac.uk Date: Fri, 19 Aug 2005 17:56:20 +0000 (+0000) Subject: Fix x86/64 build by defining correct vcpu_pickle(). X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16884^2~11^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4fa9c861ef36fed24f9ef6ea05e8e0b82c732560;p=xen.git Fix x86/64 build by defining correct vcpu_pickle(). --- diff --git 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 index b382e66182..d382b16abb 100644 --- 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 @@ -507,14 +507,14 @@ 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 ); + : "=a" (ret) + : "0" ((unsigned long)__HYPERVISOR_sched_op), + "D" ((unsigned long)SCHEDOP_vcpu_pickle | (vcpu << SCHEDOP_vcpushift)), + "S" ((unsigned long)ctxt) + : __syscall_clobber ); return ret; }