From f26ce8748d0164ff5cc169c8ce7381cd27630267 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 22 Jul 2011 14:39:49 +0930
Subject: [PATCH] --- yaml --- r: 255287 b: refs/heads/master c:
 7e1941444f808d8001aa3b63588150c516321a3c h: refs/heads/master i:   255285:
 fa9d71e573cc0d2b3a7c21f3e5aa1860c9e1b541   255283:
 c4e999213ac45a4813c364fbacfeba8c5e3c7095   255279:
 45f8dcb445a7dd6833a226b97430755a39616789 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/lguest/i386_head.S | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4e5dcd0d7e6d..bdc636a0d25d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dea1c88ed11a1221581c4b202f053c4fc138704
+refs/heads/master: 7e1941444f808d8001aa3b63588150c516321a3c
diff --git a/trunk/arch/x86/lguest/i386_head.S b/trunk/arch/x86/lguest/i386_head.S
index 863b03a9fbff..c8c95e575c1e 100644
--- a/trunk/arch/x86/lguest/i386_head.S
+++ b/trunk/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