lguest: remove remaining vmcall
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 22 Jul 2011 05:09:49 +0000 (14:39 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 22 Jul 2011 05:09:49 +0000 (14:39 +0930)
We switch back from using vmcall in 091ebf07a2408f9a56634caa0f86d9360e9af23b
because it was unreliable under kvm, but I missed one (rarely-used) place.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
arch/x86/lguest/i386_head.S

index 863b03a9fbff563222fbcfcfbfa6ebef8bba6e6d..c8c95e575c1e2fd2719653418d366f70de747001 100644 (file)
@@ -101,12 +101,8 @@ send_interrupts:
         */
        pushl %eax
        movl $LHCALL_SEND_INTERRUPTS, %eax
-       /*
-        * This is a vmcall instruction (same thing that KVM uses).  Older
-        * assembler versions might not know the "vmcall" instruction, so we
-        * create one manually here.
-        */
-       .byte 0x0f,0x01,0xc1 /* KVM_HYPERCALL */
+       /* This is the actual hypercall trap. */
+       int  $LGUEST_TRAP_ENTRY
        /* Put eax back the way we found it. */
        popl %eax
        ret