diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-06-01 10:47:41 +0100 |
|---|---|---|
| committer | David Brown <david.brown@linaro.org> | 2015-12-03 16:53:49 -0800 |
| commit | b765d5d626c016e03a3b5d02468210344b194019 (patch) | |
| tree | 238f6b99954f556422265c69f17c886d8ab85147 /arch/arm64/mm/cache.S | |
| parent | 176c55e1236ccc3978228addddf6fdc99860fc6d (diff) | |
arm64: alternative: Merge alternative-asm.h into alternative.h
commit 8d883b23aed73cad844ba48051c7e96eddf0f51c upstream.
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>
Signed-off-by: David Brown <david.brown@linaro.org>
Diffstat (limited to 'arch/arm64/mm/cache.S')
| -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 8eaf18577d71..de1e66bccd0c 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -21,7 +21,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" |