arm64: Fold proc-macros.S into assembler.h
authorGeoff Levand <geoff@infradead.org>
Wed, 27 Apr 2016 16:47:00 +0000 (17:47 +0100)
committerAlex Shi <alex.shi@linaro.org>
Thu, 10 Nov 2016 07:43:57 +0000 (15:43 +0800)
commita7ba39df2de41823e8b0dcda1ab183e71feb988a
tree091e9a35ce644a28b7397979631c725df48470ed
parent9502888106b61278b043b20032ee45de159384df
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>
(cherry picked from commit 7b7293ae3dbd0a1965bf310b77fed5f9bb37bb93)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Conflicts:
remove obsolete arch/arm64/mm/proc-macros.S
arch/arm64/include/asm/assembler.h
arch/arm64/mm/cache.S
arch/arm64/mm/proc-macros.S [deleted file]
arch/arm64/mm/proc.S