[Lguest] [PATCH] lguest: fix mis-merge against hpa's TSS renaming

[Rusty Russell]

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 at rustcorp.com.au>

diff -r bf3a09b5070a drivers/lguest/x86/core.c
--- a/drivers/lguest/x86/core.c	Thu Jan 31 14:50:43 2008 +1100
+++ b/drivers/lguest/x86/core.c	Thu Jan 31 17:58:44 2008 +1100
@@ -94,7 +94,7 @@ static void copy_in_guest_info(struct lg
 	/* 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. */