diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-12-10 19:57:17 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-10 19:57:17 +0100 |
| commit | d34664f63bba9c884920d86ab67379a08a4ee8e9 (patch) | |
| tree | d35143f376ab6666976ef84b23cf7848a945c7ca /arch/arm64/kernel/Makefile | |
| parent | Merge branch 'kvm/cortex-a76-erratum-1165522' into aarch64/for-next/core (diff) | |
| parent | arm64: kexec_file: forbid kdump via kexec_file_load() (diff) | |
| download | linux-d34664f63bba9c884920d86ab67379a08a4ee8e9.tar.xz linux-d34664f63bba9c884920d86ab67379a08a4ee8e9.zip | |
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/Makefile')
| -rw-r--r-- | arch/arm64/kernel/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index e069f957ec28..583334ce1c2c 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -49,8 +49,9 @@ arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o -arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \ +arm64-obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \ cpu-reset.o +arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o |