From d4764408db9488517150d6eb1f662f92a1a07bc3 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 26 Jun 2020 11:30:55 +0100 Subject: [PATCH] x86/boot: Don't disable PV32 when XEN_SHSTK is compiled out There is no need to automatically disable PV32 support on SHSTK-capable hardware if Xen isn't actually using the feature. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Paul Durrant --- xen/arch/x86/setup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2aa1cd50b8..c9b6af826d 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -95,7 +95,11 @@ unsigned long __initdata highmem_start; size_param("highmem-start", highmem_start); #endif +#ifdef CONFIG_XEN_SHSTK static bool __initdata opt_xen_shstk = true; +#else +#define opt_xen_shstk false +#endif static int __init parse_cet(const char *s) { -- 2.30.2