Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[sfrench/cifs-2.6.git] / arch / x86 / lguest / i386_head.S

diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/i386_head.S
index 10b9bd35a8ff9fbfb233883f23b970264eeb34d9..f795419894718796d48050f80a6b279a6a875dff 100644 (file)
--- a/arch/x86/lguest/i386_head.S
+++ b/arch/x86/lguest/i386_head.S
@@ -27,8 +27,8 @@ ENTRY(lguest_entry)
        /* We make the "initialization" hypercall now to tell the Host about
         * us, and also find out where it put our page tables. */
        movl $LHCALL_LGUEST_INIT, %eax
-       movl $lguest_data - __PAGE_OFFSET, %edx
-       int $LGUEST_TRAP_ENTRY
+       movl $lguest_data - __PAGE_OFFSET, %ebx
+       .byte 0x0f,0x01,0xc1 /* KVM_HYPERCALL */
 
        /* Set up the initial stack so we can run C code. */
        movl $(init_thread_union+THREAD_SIZE),%esp