BACKPORT: arm64: Fold proc-macros.S into assembler.h
authorGeoff Levand <geoff@infradead.org>
Wed, 27 Apr 2016 16:47:00 +0000 (17:47 +0100)
committerSami Tolvanen <samitolvanen@google.com>
Thu, 29 Sep 2016 17:52:56 +0000 (10:52 -0700)
commit9c8a3a98f3c33eb7665dd5f101f28c46fedb4b75
tree36493a47df61e8f977ae0c8ecf504142b70674a3
parent2515432e66e01f632e49069e7c04b969dc13c3d5
BACKPORT: arm64: Fold proc-macros.S into assembler.h

To allow the assembler macros defined in arch/arm64/mm/proc-macros.S to
be used outside the mm code move the contents of proc-macros.S to
asm/assembler.h.  Also, delete proc-macros.S, and fix up all references
to proc-macros.S.

Signed-off-by: Geoff Levand <geoff@infradead.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
[rebased, included dcache_by_line_op]
Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Change-Id: I09e694442ffd25dcac864216d0369c9727ad0090
(cherry picked from commit 7b7293ae3dbd0a1965bf310b77fed5f9bb37bb93)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
arch/arm64/include/asm/assembler.h
arch/arm64/mm/cache.S
arch/arm64/mm/proc-macros.S [deleted file]
arch/arm64/mm/proc.S