diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 20:57:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 20:57:39 -0400 |
| commit | db6f204019380c788f1de06ee937bdbccd60e5c0 (patch) | |
| tree | f8ca32ab6932a21797dbc5aa77688ea017959da0 /drivers/lguest/segments.c | |
| 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 'drivers/lguest/segments.c')
| -rw-r--r-- | drivers/lguest/segments.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/lguest/segments.c b/drivers/lguest/segments.c index ec6aa3f1c36b..4f15439b7f12 100644 --- a/drivers/lguest/segments.c +++ b/drivers/lguest/segments.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | * "Task State Segment" which controls all kinds of delicate things. The | 45 | * "Task State Segment" which controls all kinds of delicate things. The |
| 46 | * LGUEST_CS and LGUEST_DS entries are reserved for the Switcher, and the | 46 | * LGUEST_CS and LGUEST_DS entries are reserved for the Switcher, and the |
| 47 | * the Guest can't be trusted to deal with double faults. */ | 47 | * the Guest can't be trusted to deal with double faults. */ |
| 48 | static int ignored_gdt(unsigned int num) | 48 | static bool ignored_gdt(unsigned int num) |
| 49 | { | 49 | { |
| 50 | return (num == GDT_ENTRY_TSS | 50 | return (num == GDT_ENTRY_TSS |
| 51 | || num == GDT_ENTRY_LGUEST_CS | 51 | || num == GDT_ENTRY_LGUEST_CS |