summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2015-06-01 10:47:41 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2015-06-05 10:38:53 +0100
commit8d883b23aed73cad844ba48051c7e96eddf0f51c (patch)
tree7cda75ebfd5d669e73fe699d81ca6f4d037d6299 /arch/arm64/kernel
parent7616fc8bcd7ef4975a294337d6cd3007b8c18746 (diff)
downloadop-kernel-dev-8d883b23aed73cad844ba48051c7e96eddf0f51c.zip
op-kernel-dev-8d883b23aed73cad844ba48051c7e96eddf0f51c.tar.gz
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/kernel')
-rw-r--r--arch/arm64/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 9fe1a85..d369ccf 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -21,7 +21,7 @@
#include <linux/init.h>
#include <linux/linkage.h>
-#include <asm/alternative-asm.h>
+#include <asm/alternative.h>
#include <asm/assembler.h>
#include <asm/asm-offsets.h>
#include <asm/cpufeature.h>
OpenPOWER on IntegriCloud