diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-22 14:39:49 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-22 14:39:49 +0930 |
| commit | 7e1941444f808d8001aa3b63588150c516321a3c (patch) | |
| tree | 67facf903ab16a623ac49695c36d23a1226bf9cd /arch/x86/lguest | |
| parent | 5dea1c88ed11a1221581c4b202f053c4fc138704 (diff) | |
| download | linux-stable-7e1941444f808d8001aa3b63588150c516321a3c.tar.gz linux-stable-7e1941444f808d8001aa3b63588150c516321a3c.tar.bz2 linux-stable-7e1941444f808d8001aa3b63588150c516321a3c.zip | |
lguest: remove remaining vmcall
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>
Diffstat (limited to 'arch/x86/lguest')
| -rw-r--r-- | arch/x86/lguest/i386_head.S | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/i386_head.S index 863b03a9fbff..c8c95e575c1e 100644 --- a/arch/x86/lguest/i386_head.S +++ b/arch/x86/lguest/i386_head.S @@ -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 |