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

Commit 824a2870 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, asmlinkage, paravirt: Don't rely on local assembler labels 



The paravirt patching code assumes that it can reference a
local assembler label between two different top level assembler
statements. This does not work with LTO
where the assembler code may end up in different assembler files.

Replace it with extern / global /asm linkage labels.

This also removes one redundant copy of the macro.

Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1382458079-24450-4-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 9549b9b3

arch/x86/include/asm/paravirt_types.h

+5 −4
Original line number Original line Diff line number Diff line
@@ -388,10 +388,11 @@ extern struct pv_lock_ops pv_lock_ops; 
	_paravirt_alt(insn_string, "%c[paravirt_typenum]", "%c[paravirt_clobber]")

	_paravirt_alt(insn_string, "%c[paravirt_typenum]", "%c[paravirt_clobber]")





/* Simple instruction patching code. */

/* Simple instruction patching code. */

#define NATIVE_LABEL(a,x,b) "\n\t.globl " a #x "_" #b "\n" a #x "_" #b ":\n\t"



#define DEF_NATIVE(ops, name, code)					\

#define DEF_NATIVE(ops, name, code)					\

	extern const char start_##ops##_##name[] __visible,		\

	__visible extern const char start_##ops##_##name[], end_##ops##_##name[];	\

			  end_##ops##_##name[] __visible;		\

	asm(NATIVE_LABEL("start_", ops, name) code NATIVE_LABEL("end_", ops, name))

	asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":")





unsigned paravirt_patch_nop(void);

unsigned paravirt_patch_nop(void);

unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len);

unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len);