diff --git a/[refs] b/[refs] index 0b6e277d58cb..9a30d8e6d14b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 200001eb140ea33477965f2050bea0dac801974b +refs/heads/master: 383bc5cecc2ed0b8f44a25488660b03030425ef7 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 112afd368c77..25ff7548d3da 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -1269,7 +1269,6 @@ config KEXEC config CRASH_DUMP bool "kernel crash dumps (EXPERIMENTAL)" - depends on EXPERIMENTAL depends on X86_64 || (X86_32 && HIGHMEM) help Generate crash dump after being started by kexec. diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig index 2694648cbd1b..313b2e06ded5 100644 --- a/trunk/fs/Kconfig +++ b/trunk/fs/Kconfig @@ -930,7 +930,7 @@ config PROC_KCORE config PROC_VMCORE bool "/proc/vmcore support (EXPERIMENTAL)" - depends on PROC_FS && EXPERIMENTAL && CRASH_DUMP + depends on PROC_FS && CRASH_DUMP default y help Exports the dump image of crashed kernel in ELF format.