Fix "W" macro in unified.h
Subsystems (2)
PATCH 1/1 Fix "W" macro in unified.h
Please, fold into 0becb088501886f37ade38762c8eaaf4263572cc aka "Thumb-2: Add macros for the unified assembler syntax"
otherwise:
crypto/cast6.c:372:39: error: macro "W" passed 2 arguments, but takes just 1
---
arch/arm/include/asm/unified.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/include/asm/unified.h +4 -0
@@ -35,7 +35,9 @@ #define ARM(x...) #define THUMB(x...) x +#ifdef __ASSEMBLY__#define W (instr) instr.w +#endif #define BSYM (sym) sym + 1#else /* !CONFIG_THUMB2_KERNEL */
@@ -45,7 +47,9 @@ #define ARM(x...) x #define THUMB(x...) +#ifdef __ASSEMBLY__#define W (instr) instr +#endif #define BSYM (sym) sym#endif /* CONFIG_THUMB2_KERNEL */
Quoted 8 lines · Alexey Dobriyan
Please, fold into
0becb088501886f37ade38762c8eaaf4263572ccaka "Thumb-2: Add macros for the unified assembler syntax"otherwise:
crypto/cast6.c:372:39: error: macro "W" passed 2 arguments, but takes just 1Signed-off-by Alexey Dobriyan <[email protected]>
Thanks for this. I added it as a new patch since Russell already merged the current thumb-2 branch and I don't want to modify the history.
The unified.h file is automatically included in the .S files only. But it seems that it gets included in C files via asm/uaccess.h, so this patch makes sense.
Russell, would you like the patch on top of my thumb-2 git branch (should only pull one patch as I haven't rebased it) or to the patch system (but Alexey should send it so that the author information is preserved)?
Thanks.
Signature · 1 line
Catalin