diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-01-31 02:00:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-31 03:59:44 -0500 |
| commit | e95035c61a4c3dae1aa543a5bf5b39846daca061 (patch) | |
| tree | f0977e07936253923239ff1f251192607cc873ab /drivers/lguest/x86 | |
| parent | 24af8cb86973dde9bf8df51bef923fda8718bdb5 (diff) | |
lguest: fix mis-merge against hpa's TSS renaming
drivers/lguest/x86/core.c: In function ‘copy_in_guest_info’:
drivers/lguest/x86/core.c:97: error: ‘struct x86_hw_tss’ has no member named ‘esp1’
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/lguest/x86')
| -rw-r--r-- | drivers/lguest/x86/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 61f2f8eb8cad..635187812d52 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c | |||
| @@ -94,7 +94,7 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages) | |||
| 94 | /* Set up the two "TSS" members which tell the CPU what stack to use | 94 | /* Set up the two "TSS" members which tell the CPU what stack to use |
| 95 | * for traps which do directly into the Guest (ie. traps at privilege | 95 | * for traps which do directly into the Guest (ie. traps at privilege |
| 96 | * level 1). */ | 96 | * level 1). */ |
| 97 | pages->state.guest_tss.esp1 = cpu->esp1; | 97 | pages->state.guest_tss.sp1 = cpu->esp1; |
| 98 | pages->state.guest_tss.ss1 = cpu->ss1; | 98 | pages->state.guest_tss.ss1 = cpu->ss1; |
| 99 | 99 | ||
| 100 | /* Copy direct-to-Guest trap entries. */ | 100 | /* Copy direct-to-Guest trap entries. */ |