diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-06-01 05:47:41 -0400 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-06-05 05:38:53 -0400 |
| commit | 8d883b23aed73cad844ba48051c7e96eddf0f51c (patch) | |
| tree | 7cda75ebfd5d669e73fe699d81ca6f4d037d6299 /arch/arm64/kernel/entry.S | |
| 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>
Diffstat (limited to 'arch/arm64/kernel/entry.S')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 9fe1a85c2027..d369ccff67e2 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/linkage.h> | 22 | #include <linux/linkage.h> |
| 23 | 23 | ||
| 24 | #include <asm/alternative-asm.h> | 24 | #include <asm/alternative.h> |
| 25 | #include <asm/assembler.h> | 25 | #include <asm/assembler.h> |
| 26 | #include <asm/asm-offsets.h> | 26 | #include <asm/asm-offsets.h> |
| 27 | #include <asm/cpufeature.h> | 27 | #include <asm/cpufeature.h> |