[Xen-changelog] [xen staging] xen/arm64: livepatch: Fix build after 03957f58db

[patchbot@xxxxxxx]

commit 4973997f70860c10093ce34294be0c588ddc8cf3
Author:     Julien Grall <julien.grall@xxxxxxx>
AuthorDate: Tue May 21 15:24:55 2019 +0100
Commit:     Julien Grall <julien.grall@xxxxxxx>
CommitDate: Tue May 21 15:32:34 2019 +0100

    xen/arm64: livepatch: Fix build after 03957f58db
    
    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: Andrew Cooper <andrew.cooper3@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. */
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog