summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-01-31 18:00:47 +1100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-01-31 19:59:44 +1100
commite95035c61a4c3dae1aa543a5bf5b39846daca061 (patch)
treef0977e07936253923239ff1f251192607cc873ab /drivers
parent24af8cb86973dde9bf8df51bef923fda8718bdb5 (diff)
downloadop-kernel-dev-e95035c61a4c3dae1aa543a5bf5b39846daca061.zip
op-kernel-dev-e95035c61a4c3dae1aa543a5bf5b39846daca061.tar.gz
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')
-rw-r--r--drivers/lguest/x86/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 61f2f8e..6351878 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)
/* Set up the two "TSS" members which tell the CPU what stack to use
* for traps which do directly into the Guest (ie. traps at privilege
* level 1). */
- pages->state.guest_tss.esp1 = cpu->esp1;
+ pages->state.guest_tss.sp1 = cpu->esp1;
pages->state.guest_tss.ss1 = cpu->ss1;
/* Copy direct-to-Guest trap entries. */
OpenPOWER on IntegriCloud