From: Julien Grall Date: Mon, 16 Jul 2018 17:26:58 +0000 (+0100) Subject: xen/arm: cpregs: Allow HSR_CPREG* to receive more than 1 parameter X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3417 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4038f580aa4558f6b4ce66424e6cc2ebc5367d52;p=xen.git xen/arm: cpregs: Allow HSR_CPREG* to receive more than 1 parameter At the moment, HSR_CPREG is expected to receive only the co-processor register name in parameter. Because the name is actually a define, this may have been expanded by a previous macro. Rather than imposing the use of _HSR_CPREG* in such cases, allow HSR_CPREG to receive more than 1 parameter. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index 8db65d5e2a..4c74e8161b 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -47,8 +47,8 @@ ((__HSR_CPREG_##op1) << HSR_CP64_OP1_SHIFT) /* Encode a register as per HSR ISS pattern */ -#define HSR_CPREG32(X) _HSR_CPREG32(X) -#define HSR_CPREG64(X) _HSR_CPREG64(X) +#define HSR_CPREG32(X...) _HSR_CPREG32(X) +#define HSR_CPREG64(X...) _HSR_CPREG64(X) /* * Order registers by Coprocessor-> CRn-> Opcode 1-> CRm-> Opcode 2