Re: [Xen-devel] [PATCH] xen/arm64: livepatch: Fix build after 03957f58db

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Tue, 21 May 2019, Julien Grall wrote:
> Commit 03957f58db "xen/const: Extend the existing macro BIT to take a
> suffix in parameter" didn't convert all the callers of the macro BIT.
> 
> This will result to a build breakage when enabling Livepatch on arm64.
> 
> Reported-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> Signed-off-by: Julien Grall <julien.grall@xxxxxxx>

Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


> ---
>  xen/arch/arm/arm64/livepatch.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/xen/arch/arm/arm64/livepatch.c b/xen/arch/arm/arm64/livepatch.c
> index 2247b925a0..5c75779284 100644
> --- a/xen/arch/arm/arm64/livepatch.c
> +++ b/xen/arch/arm/arm64/livepatch.c
> @@ -208,7 +208,7 @@ static int reloc_insn_imm(enum aarch64_reloc_op op, void 
> *dest, u64 val,
>      sval >>= lsb;
>  
>      /* Extract the value bits and shift them to bit 0. */
> -    imm_mask = (BIT(lsb + len) - 1) >> lsb;
> +    imm_mask = (BIT(lsb + len, UL) - 1) >> lsb;
>      imm = sval & imm_mask;
>  
>      /* Update the instruction's immediate field. */
> -- 
> 2.11.0
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel