ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull
authorVictor Kamensky <victor.kamensky@linaro.org>
Tue, 25 Feb 2014 07:41:09 +0000 (08:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Feb 2014 11:33:57 +0000 (11:33 +0000)
commitd98b90ea22b0a28d9d787769704a9cf1ea5a513a
treeb971e6e8940621db94bb7e5f07aab6869bc3efef
parent74c4137b2a9c73e7e6887ea1bac93d7012827012
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>
arch/arm/include/asm/assembler.h
arch/arm/lib/copy_template.S
arch/arm/lib/csumpartialcopygeneric.S
arch/arm/lib/io-readsl.S
arch/arm/lib/io-writesl.S
arch/arm/lib/memmove.S
arch/arm/lib/uaccess.S