From: Rusty Russell Date: Thu, 31 Jan 2008 07:00:47 +0000 (+1100) Subject: lguest: fix mis-merge against hpa's TSS renaming X-Git-Tag: v2.6.25-rc1~1129 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e95035c61a4c3dae1aa543a5bf5b39846daca061;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Linus Torvalds --- diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 61f2f8eb8ca..635187812d5 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. */