diff options
author | Geoff Levand <geoff@infradead.org> | 2016-06-23 17:54:48 +0000 |
---|---|---|
committer | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2017-06-19 15:09:00 +0900 |
commit | 32885538ffbf0dbd0562f23854770cfec175412b (patch) | |
tree | 8c5ebe53f687a51a3a858755dbbf28a51fc3df75 /include/uapi/linux | |
parent | 46165e514b13be831a7e033056328dd483a65963 (diff) |
arm64/kexec: Add core kexec support
Add three new files, kexec.h, machine_kexec.c and relocate_kernel.S to the
arm64 architecture that add support for the kexec re-boot mechanism
(CONFIG_KEXEC) on arm64 platforms.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Reviewed-by: James Morse <james.morse@arm.com>
[catalin.marinas@arm.com: removed dead code following James Morse's comments]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Conflicts:
arch/arm64/Kconfig
arch/arm64/kernel/Makefile
Makefile was wrongly modified when merging:
commit 762f201f0a44 ("arm64: kernel: implement ACPI parking protocol")
Diffstat (limited to 'include/uapi/linux')
-rw-r--r-- | include/uapi/linux/kexec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 99048e501b88..aae5ebf2022b 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -39,6 +39,7 @@ #define KEXEC_ARCH_SH (42 << 16) #define KEXEC_ARCH_MIPS_LE (10 << 16) #define KEXEC_ARCH_MIPS ( 8 << 16) +#define KEXEC_ARCH_AARCH64 (183 << 16) /* The artificial cap on the number of segments passed to kexec_load. */ #define KEXEC_SEGMENT_MAX 16 |