diff options
| author | Juergen Gross <jgross@suse.com> | 2022-11-04 08:26:58 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-11-22 16:11:57 +0100 |
| commit | 0bafc51babe2344e9b0ff6629a4f044727728349 (patch) | |
| tree | 12a8137bae967148f2b461e1a1e07dcf5f8c4339 /arch/x86/include/asm/entry-common.h | |
| parent | x86/cpufeatures: Add X86_FEATURE_XENPV to disabled-features.h (diff) | |
| download | linux-0bafc51babe2344e9b0ff6629a4f044727728349.tar.xz linux-0bafc51babe2344e9b0ff6629a4f044727728349.zip | |
x86/cpu: Remove unneeded 64-bit dependency in arch_enter_from_user_mode()
The check for 64-bit mode when testing X86_FEATURE_XENPV isn't needed,
as Xen PV guests are no longer supported in 32-bit mode, see
a13f2ef168cb ("x86/xen: remove 32-bit Xen PV guest support").
While at it switch from boot_cpu_has() to cpu_feature_enabled().
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/r/20221104072701.20283-3-jgross@suse.com
Diffstat (limited to 'arch/x86/include/asm/entry-common.h')
| -rw-r--r-- | arch/x86/include/asm/entry-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/entry-common.h b/arch/x86/include/asm/entry-common.h index 674ed46d3ced..117903881fe4 100644 --- a/arch/x86/include/asm/entry-common.h +++ b/arch/x86/include/asm/entry-common.h @@ -24,8 +24,8 @@ static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs) /* * For !SMAP hardware we patch out CLAC on entry. */ - if (boot_cpu_has(X86_FEATURE_SMAP) || - (IS_ENABLED(CONFIG_64BIT) && boot_cpu_has(X86_FEATURE_XENPV))) + if (cpu_feature_enabled(X86_FEATURE_SMAP) || + cpu_feature_enabled(X86_FEATURE_XENPV)) mask |= X86_EFLAGS_AC; WARN_ON_ONCE(flags & mask); |