diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-18 16:09:33 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-09-19 00:30:11 +0200 |
| commit | 74109b8913277b1dbd072039d1e0a930d2834389 (patch) | |
| tree | 3a0f83d7fb624a9a44a8e29f3938c68f135770fe /arch/arm/include/asm/unified.h | |
| parent | Clear the exclusive monitor when returning from an exception (diff) | |
| download | linux-74109b8913277b1dbd072039d1e0a930d2834389.tar.xz linux-74109b8913277b1dbd072039d1e0a930d2834389.zip | |
Fix "W" macro in arch/arm/include/asm/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
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/include/asm/unified.h')
| -rw-r--r-- | arch/arm/include/asm/unified.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h index 073e85b9b961..bc631161e9c6 100644 --- a/arch/arm/include/asm/unified.h +++ b/arch/arm/include/asm/unified.h @@ -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 */ |