diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2015-06-01 09:47:41 (GMT) |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-06-05 09:38:53 (GMT) |
commit | 8d883b23aed73cad844ba48051c7e96eddf0f51c (patch) | |
tree | 7cda75ebfd5d669e73fe699d81ca6f4d037d6299 /arch/arm64/mm | |
parent | 7616fc8bcd7ef4975a294337d6cd3007b8c18746 (diff) | |
download | linux-8d883b23aed73cad844ba48051c7e96eddf0f51c.tar.xz |
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>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r-- | arch/arm64/mm/cache.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index f563e9a..bdeb5d3 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -22,7 +22,7 @@ #include <linux/init.h> #include <asm/assembler.h> #include <asm/cpufeature.h> -#include <asm/alternative-asm.h> +#include <asm/alternative.h> #include "proc-macros.S" |