diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-12-10 18:57:17 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-10 18:57:17 +0000 |
| commit | d34664f63bba9c884920d86ab67379a08a4ee8e9 (patch) | |
| tree | d35143f376ab6666976ef84b23cf7848a945c7ca /arch/arm64/kernel/head.S | |
| parent | bc84a2d106beab6000223b569c3bcb9ebf49d9ec (diff) | |
| parent | 394135c1ff13ec9b5a38a36bbdb5811f2f595e94 (diff) | |
Merge branch 'for-next/kexec' into aarch64/for-next/core
Merge in kexec_file_load() support from Akashi Takahiro.
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index eaa68ce6a06d..6d6e3bca68a9 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -31,6 +31,7 @@ #include <asm/cache.h> #include <asm/cputype.h> #include <asm/elf.h> +#include <asm/image.h> #include <asm/kernel-pgtable.h> #include <asm/kvm_arm.h> #include <asm/memory.h> @@ -91,7 +92,7 @@ _head: .quad 0 // reserved .quad 0 // reserved .quad 0 // reserved - .ascii "ARM\x64" // Magic number + .ascii ARM64_IMAGE_MAGIC // Magic number #ifdef CONFIG_EFI .long pe_header - _head // Offset to the PE header. |