Skip to content

Commit ecac718

Browse files
jgross1Ingo Molnar
authored andcommitted
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: Juergen Gross <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 94b827b commit ecac718

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

arch/x86/entry/entry_64.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
.code64
4747
.section .entry.text, "ax"
4848

49-
#ifdef CONFIG_PARAVIRT
49+
#ifdef CONFIG_PARAVIRT_XXL
5050
SYM_CODE_START(native_usergs_sysret64)
5151
UNWIND_HINT_EMPTY
5252
swapgs
5353
sysretq
5454
SYM_CODE_END(native_usergs_sysret64)
55-
#endif /* CONFIG_PARAVIRT */
55+
#endif /* CONFIG_PARAVIRT_XXL */
5656

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

arch/x86/include/asm/fixmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ enum fixed_addresses {
9999
FIX_PCIE_MCFG,
100100
#endif
101101
#endif
102-
#ifdef CONFIG_PARAVIRT
102+
#ifdef CONFIG_PARAVIRT_XXL
103103
FIX_PARAVIRT_BOOTMAP,
104104
#endif
105105
#ifdef CONFIG_X86_INTEL_MID

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#endif
5555

5656
#ifdef CONFIG_X86_64
57-
#ifdef CONFIG_PARAVIRT
57+
#ifdef CONFIG_PARAVIRT_XXL
5858
/* Paravirtualized systems may not have PSE or PGE available */
5959
#define NEED_PSE 0
6060
#define NEED_PGE 0

0 commit comments

Comments
 (0)