diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-18 10:09:33 -0400 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-09-18 18:30:11 -0400 |
| commit | 74109b8913277b1dbd072039d1e0a930d2834389 (patch) | |
| tree | 3a0f83d7fb624a9a44a8e29f3938c68f135770fe | |
| parent | 200b812d0084f800bc52465e273b118ff5f8141f (diff) | |
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>
| -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 @@ | |||
| 35 | 35 | ||
| 36 | #define ARM(x...) | 36 | #define ARM(x...) |
| 37 | #define THUMB(x...) x | 37 | #define THUMB(x...) x |
| 38 | #ifdef __ASSEMBLY__ | ||
| 38 | #define W(instr) instr.w | 39 | #define W(instr) instr.w |
| 40 | #endif | ||
| 39 | #define BSYM(sym) sym + 1 | 41 | #define BSYM(sym) sym + 1 |
| 40 | 42 | ||
| 41 | #else /* !CONFIG_THUMB2_KERNEL */ | 43 | #else /* !CONFIG_THUMB2_KERNEL */ |
| @@ -45,7 +47,9 @@ | |||
| 45 | 47 | ||
| 46 | #define ARM(x...) x | 48 | #define ARM(x...) x |
| 47 | #define THUMB(x...) | 49 | #define THUMB(x...) |
| 50 | #ifdef __ASSEMBLY__ | ||
| 48 | #define W(instr) instr | 51 | #define W(instr) instr |
| 52 | #endif | ||
| 49 | #define BSYM(sym) sym | 53 | #define BSYM(sym) sym |
| 50 | 54 | ||
| 51 | #endif /* CONFIG_THUMB2_KERNEL */ | 55 | #endif /* CONFIG_THUMB2_KERNEL */ |