From: Geoff Levand <geoff@infradead.org>
Date: Thu, 23 Jun 2016 17:54:48 +0000 (+0000)
Subject: arm64/kexec: Enable kexec in the arm64 defconfig
X-Git-Tag: release-20171130_firefly~4^2~100^2~1^2~2^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5dbf54ceab057d9aee577e82c248e9e25862494e;p=firefly-linux-kernel-4.4.55.git

arm64/kexec: Enable kexec in the arm64 defconfig

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Conflicts:
	arch/arm64/configs/defconfig
due to missing commit 531d3067314f ("arm64: defconfig: updates for 4.5")
---

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 79717faf2161..a413dd821f84 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -58,6 +58,7 @@ CONFIG_PREEMPT=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
+CONFIG_KEXEC=y
 CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_COMPAT=y