On 25/09/2024 9:42 am, Roger Pau Monne wrote:
> diff --git a/xen/arch/x86/include/asm/alternative.h
> b/xen/arch/x86/include/asm/alternative.h
> index 69555d781ef9..b7f155994b2c 100644
> --- a/xen/arch/x86/include/asm/alternative.h
> +++ b/xen/arch/x86/include/asm/alternative.h
> @@ -7,6 +7,7 @@
> #include <xen/lib.h>
> #include <xen/stringify.h>
> #include <asm/asm-macros.h>
> +#include <asm/cpufeatureset.h>
>
> struct __packed alt_instr {
> int32_t orig_offset; /* original instruction */
> @@ -59,6 +60,9 @@ extern void alternative_branches(void);
> alt_repl_len(n2)) "-" alt_orig_len)
>
> #define ALTINSTR_ENTRY(feature, num) \
> + " .if " __stringify(feature) " >= " __stringify(NCAPINTS * 32) "\n"\
Please use STR() from macros.h. It's shorter, and we're trying to
retire the use of __stringify().
Happy to fix on commit. Reviewed-by: Andrew Cooper
<[email protected]>