diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 17:57:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 17:57:39 -0700 |
| commit | db6f204019380c788f1de06ee937bdbccd60e5c0 (patch) | |
| tree | f8ca32ab6932a21797dbc5aa77688ea017959da0 /arch/x86/lguest/i386_head.S | |
| parent | 3c6fae67d026d57f64eb3da9c0d0e76983e39ae3 (diff) | |
| parent | d1881d3192a3d3e8dc4f255b03187f4c36cb0617 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio:
lguest: barrier me harder
lguest: use bool instead of int
lguest: use KVM hypercalls
lguest: wire up pte_update/pte_update_defer
lguest: fix spurious BUG_ON() on invalid guest stack.
virtio: more neatening of virtio_ring macros.
virtio: fix BAD_RING, START_US and END_USE macros
Diffstat (limited to 'arch/x86/lguest/i386_head.S')
| -rw-r--r-- | arch/x86/lguest/i386_head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/i386_head.S index 10b9bd35a8f..f7954198947 100644 --- 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 |