projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7616fc8) | patch
arm64: alternative: Merge alternative-asm.h into alternative.h
authorMarc Zyngier <marc.zyngier@arm.com>
Mon, 1 Jun 2015 09:47:41 +0000 (10:47 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 5 Jun 2015 09:38:53 +0000 (10:38 +0100)
commit8d883b23aed73cad844ba48051c7e96eddf0f51c
tree7cda75ebfd5d669e73fe699d81ca6f4d037d6299tree | snapshot
parent7616fc8bcd7ef4975a294337d6cd3007b8c18746commit | diff
arm64: alternative: Merge alternative-asm.h into alternative.h

asm/alternative-asm.h and asm/alternative.h are extremely similar,
and really deserve to live in the same file (as this makes further
modufications a bit easier).

Fold the content of alternative-asm.h into alternative.h, and
update the few users.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/include/asm/alternative-asm.h [deleted file] blob | history
arch/arm64/include/asm/alternative.h diff | blob | history
arch/arm64/kernel/entry.S diff | blob | history
arch/arm64/mm/cache.S diff | blob | history
John Crispins staging tree