diff options
| author | Victor Kamensky <[email protected]> | 2014-02-25 08:41:09 +0100 |
|---|---|---|
| committer | Russell King <[email protected]> | 2014-02-25 11:33:57 +0000 |
| commit | d98b90ea22b0a28d9d787769704a9cf1ea5a513a (patch) | |
| tree | b971e6e8940621db94bb7e5f07aab6869bc3efef /fs/jbd2/commit.c | |
| parent | 74c4137b2a9c73e7e6887ea1bac93d7012827012 (diff) | |
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 <[email protected]>
Signed-off-by: Victor Kamensky <[email protected]>
Acked-by: Nicolas Pitre <[email protected]>
Signed-off-by: Russell King <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions