diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-21 00:50:39 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-21 00:50:39 -0700 |
commit | e04997b13a2c2fc93af970fe95fd29a74db113e8 (patch) | |
tree | a84ec3368edc3c2568a0d6acdfa0d0e50d8cacf7 /arch/x86/lguest/i386_head.S | |
parent | ipv6: Fix tcp_v6_send_response transport header setting. (diff) | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 (diff) | |
download | linux-dev-e04997b13a2c2fc93af970fe95fd29a74db113e8.tar.xz linux-dev-e04997b13a2c2fc93af970fe95fd29a74db113e8.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/x86/lguest/i386_head.S')
-rw-r--r-- | arch/x86/lguest/i386_head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/i386_head.S index 27eac0faee48..4f420c2f2d55 100644 --- a/arch/x86/lguest/i386_head.S +++ b/arch/x86/lguest/i386_head.S @@ -32,7 +32,7 @@ ENTRY(lguest_entry) */ movl $LHCALL_LGUEST_INIT, %eax movl $lguest_data - __PAGE_OFFSET, %ebx - .byte 0x0f,0x01,0xc1 /* KVM_HYPERCALL */ + int $LGUEST_TRAP_ENTRY /* Set up the initial stack so we can run C code. */ movl $(init_thread_union+THREAD_SIZE),%esp |