aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/Kconfig')
-rw-r--r--arch/i386/Kconfig18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index bf9aafad4978..7a95c58947e4 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -831,12 +831,13 @@ config CRASH_DUMP
831 depends on HIGHMEM 831 depends on HIGHMEM
832 help 832 help
833 Generate crash dump after being started by kexec. 833 Generate crash dump after being started by kexec.
834 This should be normally only set in special crash dump kernels 834 This should be normally only set in special crash dump kernels
835 which are loaded in the main kernel with kexec-tools into 835 which are loaded in the main kernel with kexec-tools into
836 a specially reserved region and then later executed after 836 a specially reserved region and then later executed after
837 a crash by kdump/kexec. The crash dump kernel must be compiled 837 a crash by kdump/kexec. The crash dump kernel must be compiled
838 to a memory address not used by the main kernel or BIOS using 838 to a memory address not used by the main kernel or BIOS using
839 PHYSICAL_START. 839 PHYSICAL_START, or it must be built as a relocatable image
840 (CONFIG_RELOCATABLE=y).
840 For more details see Documentation/kdump/kdump.txt 841 For more details see Documentation/kdump/kdump.txt
841 842
842config PHYSICAL_START 843config PHYSICAL_START
@@ -882,17 +883,17 @@ config PHYSICAL_START
882 Don't change this unless you know what you are doing. 883 Don't change this unless you know what you are doing.
883 884
884config RELOCATABLE 885config RELOCATABLE
885 bool "Build a relocatable kernel(EXPERIMENTAL)" 886 bool "Build a relocatable kernel (EXPERIMENTAL)"
886 depends on EXPERIMENTAL 887 depends on EXPERIMENTAL
887 help 888 help
888 This builds a kernel image that retains relocation information 889 This builds a kernel image that retains relocation information
889 so it can be loaded someplace besides the default 1MB. 890 so it can be loaded someplace besides the default 1MB.
890 The relocations tend to make the kernel binary about 10% larger, 891 The relocations tend to make the kernel binary about 10% larger,
891 but are discarded at runtime. 892 but are discarded at runtime.
892 893
893 One use is for the kexec on panic case where the recovery kernel 894 One use is for the kexec on panic case where the recovery kernel
894 must live at a different physical address than the primary 895 must live at a different physical address than the primary
895 kernel. 896 kernel.
896 897
897config PHYSICAL_ALIGN 898config PHYSICAL_ALIGN
898 hex "Alignment value to which kernel should be aligned" 899 hex "Alignment value to which kernel should be aligned"
@@ -1256,7 +1257,6 @@ source "fs/Kconfig"
1256 1257
1257menuconfig INSTRUMENTATION 1258menuconfig INSTRUMENTATION
1258 bool "Instrumentation Support" 1259 bool "Instrumentation Support"
1259 depends on EXPERIMENTAL
1260 default y 1260 default y
1261 ---help--- 1261 ---help---
1262 Say Y here to get to see options related to performance measurement, 1262 Say Y here to get to see options related to performance measurement,