Commit ecac7181 authored by Juergen Gross's avatar Juergen Gross Committed by Ingo Molnar
Browse files

x86/paravirt: Use CONFIG_PARAVIRT_XXL instead of CONFIG_PARAVIRT 



There are some code parts using CONFIG_PARAVIRT for Xen pvops related
issues instead of the more stringent CONFIG_PARAVIRT_XXL.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200815100641.26362-4-jgross@suse.com
parent 94b827be

arch/x86/entry/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ 
.code64

.section .entry.text, "ax"



#ifdef CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT_XXL

SYM_CODE_START(native_usergs_sysret64)

	UNWIND_HINT_EMPTY

	swapgs

	sysretq

SYM_CODE_END(native_usergs_sysret64)

#endif /* CONFIG_PARAVIRT */

#endif /* CONFIG_PARAVIRT_XXL */



/*

 * 64-bit SYSCALL instruction entry. Up to 6 arguments in registers.

arch/x86/include/asm/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ enum fixed_addresses { 
	FIX_PCIE_MCFG,

#endif

#endif

#ifdef CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT_XXL

	FIX_PARAVIRT_BOOTMAP,

#endif

#ifdef	CONFIG_X86_INTEL_MID

arch/x86/include/asm/required-features.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#endif



#ifdef CONFIG_X86_64

#ifdef CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT_XXL

/* Paravirtualized systems may not have PSE or PGE available */

#define NEED_PSE	0

#define NEED_PGE	0

CRA Git | Maintained and supported by SUSTech CRA and CCSE