diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:27:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:27:42 +1000 |
| commit | 6c76650b6e643ed2665c72305c47f08f0babd07a (patch) | |
| tree | 0e9dc0ac01586e3a0342a9e09eec0f969f1efb54 /arch/x86/include/asm/required-features.h | |
| parent | 6b382d660242a32d063d0a7e5200c3e5e702c243 (diff) | |
| parent | 71c4271c9a58a75e2b6f0ffa81292befdfb02e93 (diff) | |
| download | linux-next-6c76650b6e643ed2665c72305c47f08f0babd07a.tar.gz | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/include/asm/required-features.h')
| -rw-r--r-- | arch/x86/include/asm/required-features.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/include/asm/required-features.h b/arch/x86/include/asm/required-features.h index fac9a5c0abe9..d91ba04dd007 100644 --- a/arch/x86/include/asm/required-features.h +++ b/arch/x86/include/asm/required-features.h @@ -53,6 +53,12 @@ # define NEED_MOVBE 0 #endif +#ifdef CONFIG_X86_5LEVEL +# define NEED_LA57 (1<<(X86_FEATURE_LA57 & 31)) +#else +# define NEED_LA57 0 +#endif + #ifdef CONFIG_X86_64 #ifdef CONFIG_PARAVIRT /* Paravirtualized systems may not have PSE or PGE available */ @@ -98,7 +104,7 @@ #define REQUIRED_MASK13 0 #define REQUIRED_MASK14 0 #define REQUIRED_MASK15 0 -#define REQUIRED_MASK16 0 +#define REQUIRED_MASK16 (NEED_LA57) #define REQUIRED_MASK17 0 #define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18) |