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

Commit cdd77e87 authored by Andi Kleen's avatar Andi Kleen Committed by Rusty Russell
Browse files

x86, asmlinkage, lguest: Pass in globals into assembler statement 



Tell the compiler that the inline assembler statement
references lguest_entry.

This fixes compile problems with LTO where the variable
and the assembler code may end up in different files.

Cc: x86@kernel.org
Cc: rusty@rustcorp.com.au
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 4ae85370

drivers/lguest/x86/core.c

+4 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages) 
	 * stack, then the address of this call.  This stack layout happens to

	 * exactly match the stack layout created by an interrupt...

	 */

	asm volatile("pushf; lcall *lguest_entry"

	asm volatile("pushf; lcall *%4"

		     /*

		      * This is how we tell GCC that %eax ("a") and %ebx ("b")

		      * are changed by this routine.  The "=" means output.
@@ -169,7 +169,9 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages) 
		      * physical address of the Guest's top-level page

		      * directory.

		      */

		     : "0"(pages), "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir))

		     : "0"(pages), 

		       "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir)),

		       "m"(lguest_entry)

		     /*

		      * We tell gcc that all these registers could change,

		      * which means we don't have to save and restore them in