From: Wei Liu Date: Tue, 7 Jan 2020 17:09:38 +0000 (+0000) Subject: x86/hyperv: drop usage of GENMASK_ULL from hyperv-tlfs.h X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~922 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ca54e74e8c0d46a55667b5db8ca950750dc536e;p=xen.git x86/hyperv: drop usage of GENMASK_ULL from hyperv-tlfs.h I'm told that GENMASK_ULL shouldn't be used outside of Arm code in its current form. Requested-by: Jan Beulich Signed-off-by: Wei Liu Acked-by: Jan Beulich --- diff --git a/xen/include/asm-x86/guest/hyperv-tlfs.h b/xen/include/asm-x86/guest/hyperv-tlfs.h index 5b43f99de8..ef013175af 100644 --- a/xen/include/asm-x86/guest/hyperv-tlfs.h +++ b/xen/include/asm-x86/guest/hyperv-tlfs.h @@ -415,13 +415,13 @@ enum HV_GENERIC_SET_FORMAT { HV_GENERIC_SET_ALL, }; -#define HV_HYPERCALL_RESULT_MASK GENMASK_ULL(15, 0) +#define HV_HYPERCALL_RESULT_MASK 0xffff /* GENMASK_ULL(15, 0) */ #define HV_HYPERCALL_FAST_BIT BIT(16, UL) #define HV_HYPERCALL_VARHEAD_OFFSET 17 #define HV_HYPERCALL_REP_COMP_OFFSET 32 -#define HV_HYPERCALL_REP_COMP_MASK GENMASK_ULL(43, 32) +#define HV_HYPERCALL_REP_COMP_MASK (0xfffULL << HV_HYPERCALL_REP_COMP_OFFSET) /* GENMASK_ULL(43, 32) */ #define HV_HYPERCALL_REP_START_OFFSET 48 -#define HV_HYPERCALL_REP_START_MASK GENMASK_ULL(59, 48) +#define HV_HYPERCALL_REP_START_MASK (0xfffULL << HV_HYPERCALL_REP_START_OFFSET) /* GENMASK_ULL(59, 48) */ /* hypercall status code */ #define HV_STATUS_SUCCESS 0