diff options
| author | Victor Kamensky <victor.kamensky@linaro.org> | 2014-02-25 08:41:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-25 11:33:57 +0000 |
| commit | d98b90ea22b0a28d9d787769704a9cf1ea5a513a (patch) | |
| tree | b971e6e8940621db94bb7e5f07aab6869bc3efef /arch/score/kernel/traps.c | |
| parent | 74c4137b2a9c73e7e6887ea1bac93d7012827012 (diff) | |
| download | talos-obmc-linux-d98b90ea22b0a28d9d787769704a9cf1ea5a513a.tar.gz talos-obmc-linux-d98b90ea22b0a28d9d787769704a9cf1ea5a513a.zip | |
ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull
Renames logical shift macros, 'push' and 'pull', defined in
arch/arm/include/asm/assembler.h, into 'lspush' and 'lspull'.
That eliminates name conflict between 'push' logical shift macro
and 'push' instruction mnemonic. That allows assembler.h to be
included in .S files that use 'push' instruction.
Suggested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/score/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions
