diff options
| author | Will Deacon <will.deacon@arm.com> | 2011-07-07 14:19:53 -0400 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2011-07-07 14:19:53 -0400 |
| commit | 305edadbfbc46f1d194d27e93e4237284b95fbb0 (patch) | |
| tree | 6c1fd0318721ab4b9e06cd1794903a05df97086c /arch/arm/include/asm/assembler.h | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
| parent | 2ba564b90f4c53d7a25cdcf12c6fa15028db7bc9 (diff) | |
Merge branch 'arm/proc-macros' of git://git.linaro.org/people/dmart/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 65c3f2474f5e..29035e86a59d 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h | |||
| @@ -293,4 +293,13 @@ | |||
| 293 | .macro ldrusr, reg, ptr, inc, cond=al, rept=1, abort=9001f | 293 | .macro ldrusr, reg, ptr, inc, cond=al, rept=1, abort=9001f |
| 294 | usracc ldr, \reg, \ptr, \inc, \cond, \rept, \abort | 294 | usracc ldr, \reg, \ptr, \inc, \cond, \rept, \abort |
| 295 | .endm | 295 | .endm |
| 296 | |||
| 297 | /* Utility macro for declaring string literals */ | ||
| 298 | .macro string name:req, string | ||
| 299 | .type \name , #object | ||
| 300 | \name: | ||
| 301 | .asciz "\string" | ||
| 302 | .size \name , . - \name | ||
| 303 | .endm | ||
| 304 | |||
| 296 | #endif /* __ASM_ASSEMBLER_H__ */ | 305 | #endif /* __ASM_ASSEMBLER_H__ */ |