aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2016-06-23 17:54:48 +0000
committerAKASHI Takahiro <takahiro.akashi@linaro.org>2017-06-19 15:09:00 +0900
commit5dbf54ceab057d9aee577e82c248e9e25862494e (patch)
treea9adbdac6cf2db6e8fff1e6388f403f15c71a11b
parent32885538ffbf0dbd0562f23854770cfec175412b (diff)
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")
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
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