| commit | 8d883b23aed73cad844ba48051c7e96eddf0f51c | [log] [tgz] |
|---|---|---|
| author | Marc Zyngier <marc.zyngier@arm.com> | Mon Jun 01 10:47:41 2015 +0100 |
| committer | Catalin Marinas <catalin.marinas@arm.com> | Fri Jun 05 10:38:53 2015 +0100 |
| tree | 7cda75ebfd5d669e73fe699d81ca6f4d037d6299 | |
| parent | 7616fc8bcd7ef4975a294337d6cd3007b8c18746 [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>