diff options
-rw-r--r-- | arch/i386/Kconfig | 17 | ||||
-rw-r--r-- | arch/x86_64/Kconfig | 21 |
2 files changed, 20 insertions, 18 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 1fb616235664..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 | ||
842 | config PHYSICAL_START | 843 | config 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 | ||
884 | config RELOCATABLE | 885 | config 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 | ||
897 | config PHYSICAL_ALIGN | 898 | config PHYSICAL_ALIGN |
898 | hex "Alignment value to which kernel should be aligned" | 899 | hex "Alignment value to which kernel should be aligned" |
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 37f11f24a045..d681be88ae5d 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
@@ -582,17 +582,18 @@ config CRASH_DUMP | |||
582 | bool "kernel crash dumps (EXPERIMENTAL)" | 582 | bool "kernel crash dumps (EXPERIMENTAL)" |
583 | depends on EXPERIMENTAL | 583 | depends on EXPERIMENTAL |
584 | help | 584 | help |
585 | Generate crash dump after being started by kexec. | 585 | Generate crash dump after being started by kexec. |
586 | This should be normally only set in special crash dump kernels | 586 | This should be normally only set in special crash dump kernels |
587 | which are loaded in the main kernel with kexec-tools into | 587 | which are loaded in the main kernel with kexec-tools into |
588 | a specially reserved region and then later executed after | 588 | a specially reserved region and then later executed after |
589 | a crash by kdump/kexec. The crash dump kernel must be compiled | 589 | a crash by kdump/kexec. The crash dump kernel must be compiled |
590 | to a memory address not used by the main kernel or BIOS using | 590 | to a memory address not used by the main kernel or BIOS using |
591 | PHYSICAL_START. | 591 | PHYSICAL_START, or it must be built as a relocatable image |
592 | For more details see Documentation/kdump/kdump.txt | 592 | (CONFIG_RELOCATABLE=y). |
593 | For more details see Documentation/kdump/kdump.txt | ||
593 | 594 | ||
594 | config RELOCATABLE | 595 | config RELOCATABLE |
595 | bool "Build a relocatable kernel(EXPERIMENTAL)" | 596 | bool "Build a relocatable kernel (EXPERIMENTAL)" |
596 | depends on EXPERIMENTAL | 597 | depends on EXPERIMENTAL |
597 | help | 598 | help |
598 | Builds a relocatable kernel. This enables loading and running | 599 | Builds a relocatable kernel. This enables loading and running |
@@ -603,8 +604,8 @@ config RELOCATABLE | |||
603 | must live at a different physical address than the primary | 604 | must live at a different physical address than the primary |
604 | kernel. | 605 | kernel. |
605 | 606 | ||
606 | Note: If CONFIG_RELOCATABLE=y, then kernel run from the address | 607 | Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address |
607 | it has been loaded at and compile time physical address | 608 | it has been loaded at and the compile time physical address |
608 | (CONFIG_PHYSICAL_START) is ignored. | 609 | (CONFIG_PHYSICAL_START) is ignored. |
609 | 610 | ||
610 | config PHYSICAL_START | 611 | config PHYSICAL_START |