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 b382e6618245197a4aaf3c402181d6bb7891a2fa..d382b16abb7e14d0f61c4408245d673a703faa3b 100644 (file)
--- 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;
 }