diff options
| author | Russell King | 2013-10-23 23:38:28 +0100 |
|---|---|---|
| committer | Russell King | 2013-10-23 23:38:28 +0100 |
| commit | bdbf0a4cf2af7867dfdd09ed1d0e381eac188551 (patch) | |
| tree | 75d6094e6a75452133caf6caaec73e2108815f2c /arch/arm/include/asm/unified.h | |
| parent | 901e7e34f83fc8fb4ce82cb29e5b500b7559cd86 (diff) | |
| parent | d779c07dd72098a7416d907494f958213b7726f3 (diff) | |
Merge branch 'for-rmk/prefetch' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
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 f5989f46b4d2..b88beaba6b4a 100644 --- a/arch/arm/include/asm/unified.h +++ b/arch/arm/include/asm/unified.h @@ -38,6 +38,8 @@ #ifdef __ASSEMBLY__ #define W(instr) instr.w #define BSYM(sym) sym + 1 +#else +#define WASM(instr) #instr ".w" #endif #else /* !CONFIG_THUMB2_KERNEL */ @@ -50,6 +52,8 @@ #ifdef __ASSEMBLY__ #define W(instr) instr #define BSYM(sym) sym +#else +#define WASM(instr) #instr #endif #endif /* CONFIG_THUMB2_KERNEL */ |