Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e95035c6 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 24af8cb8

drivers/lguest/x86/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */