Skip to content

Commit 3ddd999

Browse files
AKASHI Takahirowildea01
authored andcommitted
arm64: enable KEXEC_FILE config
Modify arm64/Kconfig to enable kexec_file_load support. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Acked-by: James Morse <james.morse@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
1 parent bdd2c9d commit 3ddd999

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

arch/arm64/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,15 @@ config KEXEC
858858
but it is independent of the system firmware. And like a reboot
859859
you can start any kernel with it, not just Linux.
860860

861+
config KEXEC_FILE
862+
bool "kexec file based system call"
863+
select KEXEC_CORE
864+
help
865+
This is new version of kexec system call. This system call is
866+
file based and takes file descriptors as system call argument
867+
for kernel and initramfs as opposed to list of segments as
868+
accepted by previous system call.
869+
861870
config CRASH_DUMP
862871
bool "Build kdump crash kernel"
863872
help

arch/arm64/kernel/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o
4949
arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o
5050
arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o
5151
arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o
52-
arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \
52+
arm64-obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \
5353
cpu-reset.o
54+
arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o
5455
arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o
5556
arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o
5657
arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* kexec_file for arm64
4+
*
5+
* Copyright (C) 2018 Linaro Limited
6+
* Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
7+
*
8+
*/
9+
10+
#define pr_fmt(fmt) "kexec_file: " fmt
11+
12+
#include <linux/kexec.h>
13+
14+
const struct kexec_file_ops * const kexec_file_loaders[] = {
15+
NULL
16+
};

0 commit comments

Comments
 (0)