> -----Original Message-----
> From: Andrew Cooper <andrew.coop...@citrix.com>
> Sent: 29 June 2020 11:31
> To: Xen-devel <xen-devel@lists.xenproject.org>
> Cc: Andrew Cooper <andrew.coop...@citrix.com>; Jan Beulich
> <jbeul...@suse.com>; Wei Liu <w...@xen.org>;
> Roger Pau Monné <roger....@citrix.com>; Paul Durrant <p...@xen.org>
> 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 <andrew.coop...@citrix.com>
> ---
> CC: Jan Beulich <jbeul...@suse.com>
> CC: Wei Liu <w...@xen.org>
> CC: Roger Pau Monné <roger....@citrix.com>
> CC: Paul Durrant <p...@xen.org>
>
> For 4.14. Minor bugfix.
Release-acked-by: Paul Durrant <p...@xen.org>
> ---
> 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.11.0
