diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2020-06-13 19:50:22 +0300 |
---|---|---|
committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-06-13 19:57:21 +0300 |
commit | a7f7f6248d9740d710fd6bd190293fe5e16410ac (patch) | |
tree | dc59d36a552f7e25f909f5b2edc83f96c013befa /arch/x86 | |
parent | e4a42c82e943b97ce124539fcd7a47445b43fa0d (diff) | |
download | linux-a7f7f6248d9740d710fd6bd190293fe5e16410ac.tar.xz |
treewide: replace '---help---' in Kconfig files with 'help'
Since commit 84af7a6194e4 ("checkpatch: kconfig: prefer 'help' over
'---help---'"), the number of '---help---' has been gradually
decreasing, but there are still more than 2400 instances.
This commit finishes the conversion. While I touched the lines,
I also fixed the indentation.
There are a variety of indentation styles found.
a) 4 spaces + '---help---'
b) 7 spaces + '---help---'
c) 8 spaces + '---help---'
d) 1 space + 1 tab + '---help---'
e) 1 tab + '---help---' (correct indentation)
f) 1 tab + 1 space + '---help---'
g) 1 tab + 2 spaces + '---help---'
In order to convert all of them to 1 tab + 'help', I ran the
following commend:
$ find . -name 'Kconfig*' | xargs sed -i 's/^[[:space:]]*---help---/\thelp/'
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 276 | ||||
-rw-r--r-- | arch/x86/Kconfig.cpu | 72 | ||||
-rw-r--r-- | arch/x86/Kconfig.debug | 48 | ||||
-rw-r--r-- | arch/x86/events/Kconfig | 8 | ||||
-rw-r--r-- | arch/x86/kvm/Kconfig | 12 | ||||
-rw-r--r-- | arch/x86/ras/Kconfig | 2 |
6 files changed, 209 insertions, 209 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 10dae8b96ed5..8ea987dd44f1 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -3,7 +3,7 @@ config 64BIT bool "64-bit kernel" if "$(ARCH)" = "x86" default "$(ARCH)" != "i386" - ---help--- + help Say yes to build a 64-bit kernel - formerly known as x86_64 Say no to build a 32-bit kernel - formerly known as i386 @@ -386,7 +386,7 @@ config ZONE_DMA config SMP bool "Symmetric multi-processing support" - ---help--- + help This enables support for systems with more than one CPU. If you have a system with only one CPU, say N. If you have a system with more than one CPU, say Y. @@ -415,7 +415,7 @@ config SMP config X86_FEATURE_NAMES bool "Processor feature human-readable names" if EMBEDDED default y - ---help--- + help This option compiles in a table of x86 feature bits and corresponding names. This is required to support /proc/cpuinfo and a few kernel messages. You can disable this to save space, at the expense of @@ -426,7 +426,7 @@ config X86_FEATURE_NAMES config X86_X2APIC bool "Support x2apic" depends on X86_LOCAL_APIC && X86_64 && (IRQ_REMAP || HYPERVISOR_GUEST) - ---help--- + help This enables x2apic support on CPUs that have this feature. This allows 32-bit apic IDs (so it can support very large systems), @@ -438,7 +438,7 @@ config X86_MPPARSE bool "Enable MPS table" if ACPI || SFI default y depends on X86_LOCAL_APIC - ---help--- + help For old smp systems that do not have proper acpi support. Newer systems (esp with 64bit cpus) with acpi support, MADT and DSDT will override it @@ -481,13 +481,13 @@ if X86_32 config X86_BIGSMP bool "Support for big SMP systems with more than 8 CPUs" depends on SMP - ---help--- + help This option is needed for the systems that have more than 8 CPUs. config X86_EXTENDED_PLATFORM bool "Support for extended (non-PC) x86 platforms" default y - ---help--- + help If you disable this option then the kernel will only support standard PC platforms. (which covers the vast majority of systems out there.) @@ -509,7 +509,7 @@ if X86_64 config X86_EXTENDED_PLATFORM bool "Support for extended (non-PC) x86 platforms" default y - ---help--- + help If you disable this option then the kernel will only support standard PC platforms. (which covers the vast majority of systems out there.) @@ -533,7 +533,7 @@ config X86_NUMACHIP depends on SMP depends on X86_X2APIC depends on PCI_MMCONFIG - ---help--- + help Adds support for Numascale NumaChip large-SMP systems. Needed to enable more than ~168 cores. If you don't have one of these, you should say N here. @@ -545,7 +545,7 @@ config X86_VSMP depends on X86_64 && PCI depends on X86_EXTENDED_PLATFORM depends on SMP - ---help--- + help Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is supposed to run on these EM64T-based machines. Only choose this option if you have one of these machines. @@ -558,7 +558,7 @@ config X86_UV depends on EFI depends on X86_X2APIC depends on PCI - ---help--- + help This option is needed in order to support SGI Ultraviolet systems. If you don't have one of these, you should say N here. @@ -568,7 +568,7 @@ config X86_UV config X86_GOLDFISH bool "Goldfish (Virtual Platform)" depends on X86_EXTENDED_PLATFORM - ---help--- + help Enable support for the Goldfish virtual platform used primarily for Android development. Unless you are building for the Android Goldfish emulator say N here. @@ -583,7 +583,7 @@ config X86_INTEL_CE select X86_REBOOTFIXUPS select OF select OF_EARLY_FLATTREE - ---help--- + help Select for the Intel CE media processor (CE4100) SOC. This option compiles in support for the CE4100 SOC for settop boxes and media devices. @@ -601,7 +601,7 @@ config X86_INTEL_MID select APB_TIMER select INTEL_SCU_PCI select MFD_INTEL_MSIC - ---help--- + help Select to build a kernel capable of supporting Intel MID (Mobile Internet Device) platform systems which do not have the PCI legacy interfaces. If you are building for a PC class system say N here. @@ -621,7 +621,7 @@ config X86_INTEL_QUARK select IOSF_MBI select INTEL_IMR select COMMON_CLK - ---help--- + help Select to include support for Quark X1000 SoC. Say Y here if you have a Quark based system such as the Arduino compatible Intel Galileo. @@ -632,7 +632,7 @@ config X86_INTEL_LPSS select COMMON_CLK select PINCTRL select IOSF_MBI - ---help--- + help Select to build support for Intel Low Power Subsystem such as found on Intel Lynxpoint PCH. Selecting this option enables things like clock tree (common clock framework) and pincontrol @@ -643,7 +643,7 @@ config X86_AMD_PLATFORM_DEVICE depends on ACPI select COMMON_CLK select PINCTRL - ---help--- + help Select to interpret AMD specific ACPI device to platform device such as I2C, UART, GPIO found on AMD Carrizo and later chipsets. I2C and UART depend on COMMON_CLK to set clock. GPIO driver is @@ -652,7 +652,7 @@ config X86_AMD_PLATFORM_DEVICE config IOSF_MBI tristate "Intel SoC IOSF Sideband support for SoC platforms" depends on PCI - ---help--- + help This option enables sideband register access support for Intel SoC platforms. On these platforms the IOSF sideband is used in lieu of MSR's for some register accesses, mostly but not limited to thermal @@ -669,7 +669,7 @@ config IOSF_MBI config IOSF_MBI_DEBUG bool "Enable IOSF sideband access through debugfs" depends on IOSF_MBI && DEBUG_FS - ---help--- + help Select this option to expose the IOSF sideband access registers (MCR, MDR, MCRX) through debugfs to write and read register information from different units on the SoC. This is most useful for obtaining device @@ -685,7 +685,7 @@ config X86_RDC321X depends on X86_EXTENDED_PLATFORM select M486 select X86_REBOOTFIXUPS - ---help--- + help This option is needed for RDC R-321x system-on-chip, also known as R-8610-(G). If you don't have one of these chips, you should say N here. @@ -694,7 +694,7 @@ config X86_32_NON_STANDARD bool "Support non-standard 32-bit SMP architectures" depends on X86_32 && SMP depends on X86_EXTENDED_PLATFORM - ---help--- + help This option compiles in the bigsmp and STA2X11 default subarchitectures. It is intended for a generic binary kernel. If you select them all, kernel will probe it one by @@ -717,7 +717,7 @@ config STA2X11 select SWIOTLB select MFD_STA2X11 select GPIOLIB - ---help--- + help This adds support for boards based on the STA2X11 IO-Hub, a.k.a. "ConneXt". The chip is used in place of the standard PC chipset, so all "standard" peripherals are missing. If this @@ -727,7 +727,7 @@ config STA2X11 config X86_32_IRIS tristate "Eurobraille/Iris poweroff module" depends on X86_32 - ---help--- + help The Iris machines from EuroBraille do not have APM or ACPI support to shut themselves down properly. A special I/O sequence is needed to do so, which is what this module does at @@ -741,7 +741,7 @@ config SCHED_OMIT_FRAME_POINTER def_bool y prompt "Single-depth WCHAN output" depends on X86 - ---help--- + help Calculate simpler /proc/<PID>/wchan values. If this option is disabled then wchan values will recurse back to the caller function. This provides more accurate wchan values, @@ -751,7 +751,7 @@ config SCHED_OMIT_FRAME_POINTER menuconfig HYPERVISOR_GUEST bool "Linux guest support" - ---help--- + help Say Y here to enable options for running Linux under various hyper- visors. This option enables basic hypervisor detection and platform setup. @@ -763,7 +763,7 @@ if HYPERVISOR_GUEST config PARAVIRT bool "Enable paravirtualization code" - ---help--- + help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly over full virtualization. However, when run without a hypervisor @@ -775,14 +775,14 @@ config PARAVIRT_XXL config PARAVIRT_DEBUG bool "paravirt-ops debugging" depends on PARAVIRT && DEBUG_KERNEL - ---help--- + help Enable to debug paravirt_ops internals. Specifically, BUG if a paravirt_op is missing when it is called. config PARAVIRT_SPINLOCKS bool "Paravirtualization layer for spinlocks" depends on PARAVIRT && SMP - ---help--- + help Paravirtualized spinlocks allow a pvops backend to replace the spinlock implementation with something virtualization-friendly (for example, block the virtual CPU rather than spinning). @@ -803,7 +803,7 @@ config KVM_GUEST select PARAVIRT_CLOCK select ARCH_CPUIDLE_HALTPOLL default y - ---help--- + help This option enables various optimizations for running under the KVM hypervisor. It includes a paravirtualized clock, so that instead of relying on a PIT (or probably other) emulation by the @@ -818,14 +818,14 @@ config ARCH_CPUIDLE_HALTPOLL config PVH bool "Support for running PVH guests" - ---help--- + help This option enables the PVH entry point for guest virtual machines as specified in the x86/HVM direct boot ABI. config KVM_DEBUG_FS bool "Enable debug information for KVM Guests in debugfs" depends on KVM_GUEST && DEBUG_FS - ---help--- + help This option enables collection of various statistics for KVM guest. Statistics are displayed in debugfs filesystem. Enabling this option may incur significant overhead. @@ -833,7 +833,7 @@ config KVM_DEBUG_FS config PARAVIRT_TIME_ACCOUNTING bool "Paravirtual steal time accounting" depends on PARAVIRT - ---help--- + help Select this option to enable fine granularity task steal time accounting. Time spent executing other tasks in parallel with the current vCPU is discounted from the vCPU power. To account for @@ -848,7 +848,7 @@ config JAILHOUSE_GUEST bool "Jailhouse non-root cell support" depends on X86_64 && PCI select X86_PM_TIMER - ---help--- + help This option allows to run Linux as guest in a Jailhouse non-root cell. You can leave this option disabled if you only want to start Jailhouse and run Linux afterwards in the root cell. @@ -871,7 +871,7 @@ source "arch/x86/Kconfig.cpu" config HPET_TIMER def_bool X86_64 prompt "HPET Timer Support" if X86_32 - ---help--- + help Use the IA-PC HPET (High Precision Event Timer) to manage time in preference to the PIT and RTC, if a HPET is present. @@ -909,7 +909,7 @@ config DMI default y select DMI_SCAN_MACHINE_NON_EFI_FALLBACK bool "Enable DMI scanning" if EXPERT - ---help--- + help Enabled scanning of DMI to identify machine quirks. Say Y here unless you have verified that your setup is not affected by entries in the DMI blacklist. Required by PNP @@ -920,7 +920,7 @@ config GART_IOMMU select IOMMU_HELPER select SWIOTLB depends on X86_64 && PCI && AMD_NB - ---help--- + help Provides a driver for older AMD Athlon64/Opteron/Turion/Sempron GART based hardware IOMMUs. @@ -941,7 +941,7 @@ config MAXSMP bool "Enable Maximum number of SMP Processors and NUMA Nodes" depends on X86_64 && SMP && DEBUG_KERNEL select CPUMASK_OFFSTACK - ---help--- + help Enable maximum number of CPUS and NUMA Nodes for this architecture. If unsure, say N. @@ -997,7 +997,7 @@ config NR_CPUS int "Maximum number of CPUs" if SMP && !MAXSMP range NR_CPUS_RANGE_BEGIN NR_CPUS_RANGE_END default NR_CPUS_DEFAULT - ---help--- + help This allows you to specify the maximum number of CPUs which this kernel will support. If CPUMASK_OFFSTACK is enabled, the maximum supported value is 8192, otherwise the maximum value is 512. The @@ -1013,7 +1013,7 @@ config SCHED_MC def_bool y prompt "Multi-core scheduler support" depends on SMP - ---help--- + help Multi-core scheduler support improves the CPU scheduler's decision making when dealing with multi-core CPU chips at a cost of slightly increased overhead in some places. If unsure say N here. @@ -1024,7 +1024,7 @@ config SCHED_MC_PRIO select X86_INTEL_PSTATE select CPU_FREQ default y - ---help--- + help Intel Turbo Boost Max Technology 3.0 enabled CPUs have a core ordering determined at manufacturing time, which allows certain cores to reach higher turbo frequencies (when running @@ -1047,7 +1047,7 @@ config X86_UP_APIC bool "Local APIC support on uniprocessors" if !PCI_MSI default PCI_MSI depends on X86_32 && !SMP && !X86_32_NON_STANDARD - ---help--- + help A local APIC (Advanced Programmable Interrupt Controller) is an integrated interrupt controller in the CPU. If you have a single-CPU system which has a processor with a local APIC, you can say Y here to @@ -1060,7 +1060,7 @@ config X86_UP_APIC config X86_UP_IOAPIC bool "IO-APIC support on uniprocessors" depends on X86_UP_APIC - ---help--- + help An IO-APIC (I/O Advanced Programmable Interrupt Controller) is an SMP-capable replacement for PC-style interrupt controllers. Most SMP systems and many recent uniprocessor systems have one. @@ -1082,7 +1082,7 @@ config X86_IO_APIC config X86_REROUTE_FOR_BROKEN_BOOT_IRQS bool "Reroute for broken boot IRQs" depends on X86_IO_APIC - ---help--- + help This option enables a workaround that fixes a source of spurious interrupts. This is recommended when threaded interrupt handling is used on systems where the generation of @@ -1106,7 +1106,7 @@ config X86_MCE bool "Machine Check / overheating reporting" select GENERIC_ALLOCATOR default y - ---help--- + help Machine Check support allows the processor to notify the kernel if it detects a problem (e.g. overheating, data corruption). The action the kernel takes depends on the severity of the problem, @@ -1115,7 +1115,7 @@ config X86_MCE config X86_MCELOG_LEGACY bool "Support for deprecated /dev/mcelog character device" depends on X86_MCE - ---help--- + help Enable support for /dev/mcelog which is needed by the old mcelog userspace logging daemon. Consider switching to the new generation rasdaemon solution. @@ -1124,7 +1124,7 @@ config X86_MCE_INTEL def_bool y prompt "Intel MCE features" depends on X86_MCE && X86_LOCAL_APIC - ---help--- + help Additional support for intel specific MCE features such as the thermal monitor. @@ -1132,14 +1132,14 @@ config X86_MCE_AMD def_bool y prompt "AMD MCE features" depends on X86_MCE && X86_LOCAL_APIC && AMD_NB - ---help--- + help Additional support for AMD specific MCE features such as the DRAM Error Threshold. config X86_ANCIENT_MCE bool "Support for old Pentium 5 / WinChip machine checks" depends on X86_32 && X86_MCE - ---help--- + help Include support for machine check handling on old Pentium 5 or WinChip systems. These typically need to be enabled explicitly on the command line. @@ -1151,7 +1151,7 @@ config X86_MCE_THRESHOLD config X86_MCE_INJECT depends on X86_MCE && X86_LOCAL_APIC && DEBUG_FS tristate "Machine check injector support" - ---help--- + help Provide support for injecting machine checks for testing purposes. If you don't know what a machine check is and you don't do kernel QA it is safe to say n. @@ -1165,7 +1165,7 @@ source "arch/x86/events/Kconfig" config X86_LEGACY_VM86 bool "Legacy VM86 support" depends on X86_32 - ---help--- + help This option allows user programs to put the CPU into V8086 mode, which is an 80286-era approximation of 16-bit real mode. @@ -1197,7 +1197,7 @@ config X86_16BIT bool "Enable support for 16-bit segments" if EXPERT default y depends on MODIFY_LDT_SYSCALL - ---help--- + help This option is required by programs like Wine to run 16-bit protected mode legacy code on x86 processors. Disabling this option saves about 300 bytes on i386, or around 6K text @@ -1215,7 +1215,7 @@ config X86_VSYSCALL_EMULATION bool "Enable vsyscall emulation" if EXPERT default y depends on X86_64 - ---help--- + help This enables emulation of the legacy vsyscall page. Disabling it is roughly equivalent to booting with vsyscall=none, except that it will also disable the helpful warning if a program @@ -1232,7 +1232,7 @@ config X86_VSYSCALL_EMULATION config X86_IOPL_IOPERM bool "IOPERM and IOPL Emulation" default y - ---help--- + help This enables the ioperm() and iopl() syscalls which are necessary for legacy applications. @@ -1250,7 +1250,7 @@ config X86_IOPL_IOPERM config TOSHIBA tristate "Toshiba Laptop support" depends on X86_32 - ---help--- + help This adds a driver to safely access the System Management Mode of the CPU on Toshiba portables with a genuine Toshiba BIOS. It does not work on models with a Phoenix BIOS. The System Management Mode @@ -1267,7 +1267,7 @@ config I8K tristate "Dell i8k legacy laptop support" select HWMON select SENSORS_DELL_SMM - ---help--- + help This option enables legacy /proc/i8k userspace interface in hwmon dell-smm-hwmon driver. Character file /proc/i8k reports bios version, temperature and allows controlling fan speeds of Dell laptops via @@ -1282,7 +1282,7 @@ config I8K config X86_REBOOTFIXUPS bool "Enable X86 board specific fixups for reboot" depends on X86_32 - ---help--- + help This enables chipset and/or board specific fixups to be done in order to get reboot to work correctly. This is only needed on some combinations of hardware and BIOS. The symptom, for which @@ -1301,7 +1301,7 @@ config MICROCODE default y depends on CPU_SUP_AMD || CPU_SUP_INTEL select FW_LOADER - ---help--- + help If you say Y here, you will be able to update the microcode on Intel and AMD processors. The Intel support is for the IA32 family, e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4, Xeon etc. The @@ -1323,7 +1323,7 @@ config MICROCODE_INTEL depends on MICROCODE default MICROCODE select FW_LOADER - ---help--- + help This options enables microcode patch loading support for Intel processors. @@ -1335,7 +1335,7 @@ config MICROCODE_AMD bool "AMD microcode loading support" depends on MICROCODE select FW_LOADER - ---help--- + help If you select this option, microcode patch loading support for AMD processors will be enabled. @@ -1343,7 +1343,7 @@ config MICROCODE_OLD_INTERFACE bool "Ancient loading interface (DEPRECATED)" default n depends on MICROCODE - ---help--- + help DO NOT USE THIS! This is the ancient /dev/cpu/microcode interface which was used by userspace tools like iucode_tool and microcode.ctl. It is inadequate because it runs too late to be able to properly @@ -1353,7 +1353,7 @@ config MICROCODE_OLD_INTERFACE config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" - ---help--- + help This device gives privileged processes access to the x86 Model-Specific Registers (MSRs). It is a character device with major 202 and minors 0 to 31 for /dev/cpu/0/msr to /dev/cpu/31/msr. @@ -1362,7 +1362,7 @@ config X86_MSR config X86_CPUID tristate "/dev/cpu/*/cpuid - CPU information support" - ---help--- + help This device gives processes access to the x86 CPUID instruction to be executed on a specific processor. It is a character device with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to @@ -1375,7 +1375,7 @@ choice config NOHIGHMEM bool "off" - ---help--- + help Linux can use up to 64 Gigabytes of physical memory on x86 systems. However, the address space of 32-bit x86 processors is only 4 Gigabytes large. That means that, if you have a large amount of @@ -1411,7 +1411,7 @@ config NOHIGHMEM config HIGHMEM4G bool "4GB" - ---help--- + help Select this if you have a 32-bit processor and between 1 and 4 gigabytes of physical RAM. @@ -1419,7 +1419,7 @@ config HIGHMEM64G bool "64GB" depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6 select X86_PAE - ---help--- + help Select this if you have a 32-bit processor and more than 4 gigabytes of physical RAM. @@ -1429,7 +1429,7 @@ choice prompt "Memory split" if EXPERT default VMSPLIT_3G depends on X86_32 - ---help--- + help Select the desired split between kernel and user memory. If the address range available to the kernel is less than the @@ -1477,7 +1477,7 @@ config X86_PAE depends on X86_32 && !HIGHMEM4G select PHYS_ADDR_T_64BIT select SWIOTLB - ---help--- + help PAE is required for NX support, and furthermore enables larger swapspace support for non-overcommit purposes. It has the cost of more pagetable lookup overhead, and also @@ -1489,7 +1489,7 @@ config X86_5LEVEL select DYNAMIC_MEMORY_LAYOUT select SPARSEMEM_VMEMMAP depends on X86_64 - ---help--- + help 5-level paging enables access to larger address space: upto 128 PiB of virtual address space and 4 PiB of physical address space. @@ -1507,7 +1507,7 @@ config X86_5LEVEL config X86_DIRECT_GBPAGES def_bool y depends on X86_64 - ---help--- + help Certain kernel features effectively disable kernel linear 1 GB mappings (even if the CPU otherwise supports them), so don't confuse the user by printing @@ -1516,7 +1516,7 @@ config X86_DIRECT_GBPAGES config X86_CPA_STATISTICS bool "Enable statistic for Change Page Attribute" depends on DEBUG_FS - ---help--- + help Expose statistics about the Change Page Attribute mechanism, which helps to determine the effectiveness of preserving large and huge page mappings when mapping protections are changed. @@ -1528,7 +1528,7 @@ config AMD_MEM_ENCRYPT select DYNAMIC_PHYSICAL_MASK select ARCH_USE_MEMREMAP_PROT select ARCH_HAS_FORCE_DMA_UNENCRYPTED - ---help--- + help Say yes to enable support for the encryption of system memory. This requires an AMD processor that supports Secure Memory Encryption (SME). @@ -1537,7 +1537,7 @@ config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT bool "Activate AMD Secure Memory Encryption (SME) by default" default y depends on AMD_MEM_ENCRYPT - ---help--- + help Say yes to have system memory encrypted by default if running on an AMD processor that supports Secure Memory Encryption (SME). @@ -1553,7 +1553,7 @@ config NUMA depends on SMP depends on X86_64 || (X86_32 && HIGHMEM64G && X86_BIGSMP) default y if X86_BIGSMP - ---help--- + help Enable NUMA (Non-Uniform Memory Access) support. The kernel will try to allocate memory used by a CPU on the @@ -1572,7 +1572,7 @@ config AMD_NUMA def_bool y prompt "Old style AMD Opteron NUMA detection" depends on X86_64 && NUMA && PCI - ---help--- + help Enable AMD NUMA node topology detection. You should say Y here if you have a multi processor AMD system. This uses an old method to read the NUMA configuration directly from the builtin Northbridge @@ -1584,13 +1584,13 @@ config X86_64_ACPI_NUMA prompt "ACPI NUMA detection" depends on X86_64 && NUMA && ACPI && PCI select ACPI_NUMA - ---help--- + help Enable ACPI SRAT based node topology detection. config NUMA_EMU bool "NUMA emulation" depends on NUMA - ---help--- + help Enable NUMA emulation. A flat machine will be split into virtual nodes when booted with "numa=fake=N", where N is the number of nodes. This is only useful for debugging. @@ -1602,7 +1602,7 @@ config NODES_SHIFT default "6" if X86_64 default "3" depends on NEED_MULTIPLE_NODES - ---help--- + help Specify the maximum number of NUMA Nodes available on the target system. Increases memory reserved to accommodate various tables. @@ -1661,7 +1661,7 @@ config X86_PMEM_LEGACY config HIGHPTE bool "Allocate 3rd-level pagetables from highmem" depends on HIGHMEM - ---help--- + help The VM uses one page table entry for each page of physical memory. For systems with a lot of RAM, this can be wasteful of precious low memory. Setting this option will put user-space page table @@ -1669,7 +1669,7 @@ config HIGHPTE config X86_CHECK_BIOS_CORRUPTION bool "Check for low memory corruption" - ---help--- + help Periodically check for memory corruption in low memory, which is suspected to be caused by BIOS. Even when enabled in the configuration, it is disabled at runtime. Enable it by @@ -1693,7 +1693,7 @@ config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK bool "Set the default setting of memory_corruption_check" depends on X86_CHECK_BIOS_CORRUPTION default y - ---help--- + help Set whether the default state of memory_corruption_check is on or off. @@ -1701,7 +1701,7 @@ config X86_RESERVE_LOW int "Amount of low memory, in kilobytes, to reserve for the BIOS" default 64 range 4 640 - ---help--- + help Specify the amount of low memory to reserve for the BIOS. The first page contains BIOS data structures that the kernel @@ -1730,7 +1730,7 @@ config MATH_EMULATION bool depends on MODIFY_LDT_SYSCALL prompt "Math emulation" if X86_32 && (M486SX || MELAN) - ---help--- + help Linux can emulate a math coprocessor (used for floating point operations) if you don't have one. 486DX and Pentium processors have a math coprocessor built in, 486SX and 386 do not, unless you added @@ -1756,7 +1756,7 @@ config MATH_EMULATION config MTRR def_bool y prompt "MTRR (Memory Type Range Register) support" if EXPERT - ---help--- + help On Intel P6 family processors (Pentium Pro, Pentium II and later) the Memory Type Range Registers (MTRRs) may be used to control processor access to memory ranges. This is most useful if you have @@ -1792,7 +1792,7 @@ config MTRR_SANITIZER def_bool y prompt "MTRR cleanup support" depends on MTRR - ---help--- + help Convert MTRR layout from continuous to discrete, so X drivers can add writeback entries. @@ -1807,7 +1807,7 @@ config MTRR_SANITIZER_ENABLE_DEFAULT range 0 1 default "0" depends on MTRR_SANITIZER - ---help--- + help Enable mtrr cleanup default value config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT @@ -1815,7 +1815,7 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT range 0 7 default "1" depends on MTRR_SANITIZER - ---help--- + help mtrr cleanup spare entries default, it can be changed via mtrr_spare_reg_nr=N on the kernel command line. @@ -1823,7 +1823,7 @@ config X86_PAT def_bool y prompt "x86 PAT support" if EXPERT depends on MTRR - ---help--- + help Use PAT attributes to setup page level cache control. PATs are the modern equivalents of MTRRs and are much more @@ -1841,7 +1841,7 @@ config ARCH_USES_PG_UNCACHED config ARCH_RANDOM def_bool y prompt "x86 architectural random number generator" if EXPERT - ---help--- + help Enable the x86 architectural RDRAND instruction (Intel Bull Mountain technology) to generate random numbers. If supported, this is a high bandwidth, cryptographically @@ -1850,7 +1850,7 @@ config ARCH_RANDOM config X86_SMAP def_bool y prompt "Supervisor Mode Access Prevention" if EXPERT - ---help--- + help Supervisor Mode Access Prevention (SMAP) is a security feature in newer Intel processors. There is a small performance cost if this enabled and turned on; there is @@ -1861,7 +1861,7 @@ config X86_SMAP config X86_UMIP def_bool y prompt "User Mode Instruction Prevention" if EXPERT - ---help--- + help User Mode Instruction Prevention (UMIP) is a security feature in some x86 processors. If enabled, a general protection fault is issued if the SGDT, SLDT, SIDT, SMSW or STR instructions are @@ -1880,7 +1880,7 @@ config X86_INTEL_MEMORY_PROTECTION_KEYS depends on X86_64 && (CPU_SUP_INTEL || CPU_SUP_AMD) select ARCH_USES_HIGH_VMA_FLAGS select ARCH_HAS_PKEYS - ---help--- + help Memory Protection Keys provides a mechanism for enforcing page-based protections, but without requiring modification of the page tables when an application changes protection domains. @@ -1939,7 +1939,7 @@ config EFI depends on ACPI select UCS2_STRING select EFI_RUNTIME_WRAPPERS - ---help--- + help This enables the kernel to use EFI runtime services that are available (such as the EFI variable services). @@ -1955,7 +1955,7 @@ config EFI_STUB depends on EFI && !X86_USE_3DNOW depends on $(cc-option,-mabi=ms) || X86_32 select RELOCATABLE - ---help--- + help This kernel feature allows a bzImage to be loaded directly by EFI firmware without the use of a bootloader. @@ -1964,7 +1964,7 @@ config EFI_STUB config EFI_MIXED bool "EFI mixed-mode support" depends on EFI_STUB && X86_64 - ---help--- + help Enabling this feature allows a 64-bit kernel to be booted on a 32-bit firmware, provided that your CPU supports 64-bit mode. @@ -1978,7 +1978,7 @@ config EFI_MIXED config SECCOMP def_bool y prompt "Enable seccomp to safely compute untrusted bytecode" - ---help--- + help This kernel feature is useful for number crunching applications that may need to compute untrusted bytecode during their execution. By using pipes or other transports made available to @@ -1996,7 +1996,7 @@ source "kernel/Kconfig.hz" config KEXEC bool "kexec system call" select KEXEC_CORE - ---help--- + help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot but it is independent of the system firmware. And like a reboot @@ -2017,7 +2017,7 @@ config KEXEC_FILE depends on X86_64 depends on CRYPTO=y depends on CRYPTO_SHA256=y - ---help--- + help This is new version of kexec system call. This system call is file based and takes file descriptors as system call argument for kernel and initramfs as opposed to list of segments as @@ -2029,7 +2029,7 @@ config ARCH_HAS_KEXEC_PURGATORY config KEXEC_SIG bool "Verify kernel signature during kexec_file_load() syscall" depends on KEXEC_FILE - ---help--- + help This option makes the kexec_file_load() syscall check for a valid signature of the kernel image. The image can still be loaded without @@ -2043,7 +2043,7 @@ config KEXEC_SIG config KEXEC_SIG_FORCE bool "Require a valid signature in kexec_file_load() syscall" depends on KEXEC_SIG - ---help--- + help This option makes kernel signature verification mandatory for the kexec_file_load() syscall. @@ -2052,13 +2052,13 @@ config KEXEC_BZIMAGE_VERIFY_SIG depends on KEXEC_SIG depends on SIGNED_PE_FILE_VERIFICATION select SYSTEM_TRUSTED_KEYRING - ---help--- + help Enable bzImage signature verification support. config CRASH_DUMP bool "kernel crash dumps" depends on X86_64 || (X86_32 && HIGHMEM) - ---help--- + help Generate crash dump after being started by kexec. This should be normally only set in special crash dump kernels which are loaded in the main kernel with kexec-tools into @@ -2072,14 +2072,14 @@ config CRASH_DUMP config KEXEC_JUMP bool "kexec jump" depends on KEXEC && HIBERNATION - ---help--- + help Jump between original kernel and kexeced kernel and invoke code in physical address mode via KEXEC config PHYSICAL_START hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP) default "0x1000000" - ---help--- + help This gives the physical address where the kernel is loaded. If kernel is a not relocatable (CONFIG_RELOCATABLE=n) then @@ -2120,7 +2120,7 @@ config PHYSICAL_START config RELOCATABLE bool "Build a relocatable kernel" default y - ---help--- + help This builds a kernel image that retains relocation information so it can be loaded someplace besides the default 1MB. The relocations tend to make the kernel binary about 10% larger, @@ -2138,7 +2138,7 @@ config RANDOMIZE_BASE bool "Randomize the address of the kernel image (KASLR)" depends on RELOCATABLE default y - ---help--- + help In support of Kernel Address Space Layout Randomization (KASLR), this randomizes the physical address at which the kernel image is decompressed and the virtual address where the kernel @@ -2179,7 +2179,7 @@ config PHYSICAL_ALIGN default "0x200000" range 0x2000 0x1000000 if X86_32 range 0x200000 0x1000000 if X86_64 - ---help--- + help This value puts the alignment restrictions on physical address where kernel is loaded and run from. Kernel is compiled for an address which meets above alignment restriction. @@ -2203,7 +2203,7 @@ config PHYSICAL_ALIGN config DYNAMIC_MEMORY_LAYOUT bool - ---help--- + help This option makes base addresses of vmalloc and vmemmap as well as __PAGE_OFFSET movable during boot. @@ -2213,7 +2213,7 @@ config RANDOMIZE_MEMORY depends on RANDOMIZE_BASE select DYNAMIC_MEMORY_LAYOUT default RANDOMIZE_BASE - ---help--- + help Randomizes the base virtual address of kernel memory sections (physical memory mapping, vmalloc & vmemmap). This security feature makes exploits relying on predictable memory locations less reliable. @@ -2232,7 +2232,7 @@ config RANDOMIZE_MEMORY_PHYSICAL_PADDING default "0x0" range 0x1 0x40 if MEMORY_HOTPLUG range 0x0 0x40 - ---help--- + help Define the padding in terabytes added to the existing physical memory size during kernel memory randomization. It is useful for memory hotplug support but reduces the entropy available for @@ -2247,7 +2247,7 @@ config HOTPLUG_CPU config BOOTPARAM_HOTPLUG_CPU0 bool "Set default setting of cpu0_hotpluggable" depends on HOTPLUG_CPU - ---help--- + help Set whether default state of cpu0_hotpluggable is on or off. Say Y here to enable CPU0 hotplug by default. If this switch @@ -2276,7 +2276,7 @@ config DEBUG_HOTPLUG_CPU0 def_bool n prompt "Debug CPU0 hotplug" depends on HOTPLUG_CPU - ---help--- + help Enabling this option offlines CPU0 (if CPU0 can be offlined) as soon as possible and boots up userspace with CPU0 offlined. User can online CPU0 back after boot time. @@ -2291,7 +2291,7 @@ config COMPAT_VDSO def_bool n prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)" depends on COMPAT_32 - ---help--- + help Certain buggy versions of glibc will crash if they are presented with a 32-bit vDSO that is not mapped at the address indicated in its segment table. @@ -2369,7 +2369,7 @@ endchoice config CMDLINE_BOOL bool "Built-in kernel command line" - ---help--- + help Allow for specifying boot arguments to the kernel at build time. On some systems (e.g. embedded ones), it is necessary or convenient to provide some or all of the @@ -2387,7 +2387,7 @@ config CMDLINE string "Built-in kernel command string" depends on CMDLINE_BOOL default "" - ---help--- + help Enter arguments here that should be compiled into the kernel image and used at boot time. If the boot loader provides a command line at boot time, it is appended to this string to @@ -2403,7 +2403,7 @@ config CMDLINE config CMDLINE_OVERRIDE bool "Built-in command line overrides boot loader arguments" depends on CMDLINE_BOOL && CMDLINE != "" - ---help--- + help Set this option to 'Y' to have the kernel ignore the boot loader command line, and use ONLY the built-in command line. @@ -2413,7 +2413,7 @@ config CMDLINE_OVERRIDE config MODIFY_LDT_SYSCALL bool "Enable the LDT (local descriptor table)" if EXPERT default y - ---help--- + help Linux can allow user programs to install a per-process x86 Local Descriptor Table (LDT) using the modify_ldt(2) system call. This is required to run 16-bit or segmented code such as @@ -2477,7 +2477,7 @@ config X86_APM_BOOT menuconfig APM tristate "APM (Advanced Power Management) BIOS support" depends on X86_32 && PM_SLEEP - ---help--- + help APM is a BIOS specification for saving power using several different techniques. This is mostly useful for battery powered laptops with APM compliant BIOSes. If you say Y here, the system time will be @@ -2537,14 +2537,14 @@ if APM config APM_IGNORE_USER_SUSPEND bool "Ignore USER SUSPEND" - ---help--- + help This option will ignore USER SUSPEND requests. On machines with a compliant APM BIOS, you want to say N. However, on the NEC Versa M series notebooks, it is necessary to say Y because of a BIOS bug. config APM_DO_ENABLE bool "Enable PM at boot time" - ---help--- + help Enable APM features at boot time. From page 36 of the APM BIOS specification: "When disabled, the APM BIOS does not automatically power manage devices, enter the Standby State, enter the Suspend @@ -2562,7 +2562,7 @@ config APM_DO_ENABLE config APM_CPU_IDLE depends on CPU_IDLE bool "Make CPU Idle calls when idle" - ---help--- + help Enable calls to APM CPU Idle/CPU Busy inside the kernel's idle loop. On some machines, this can activate improved power savings, such as a slowed CPU clock rate, when the machine is idle. These idle calls @@ -2573,7 +2573,7 @@ config APM_CPU_IDLE config APM_DISPLAY_BLANK bool "Enable console blanking using APM" - ---help--- + help Enable console blanking using the APM. Some laptops can use this to turn off the LCD backlight when the screen blanker of the Linux virtual console blanks the screen. Note that this is only used by @@ -2586,7 +2586,7 @@ config APM_DISPLAY_BLANK config APM_ALLOW_INTS bool "Allow interrupts during APM BIOS calls" - ---help--- + help Normally we disable external interrupts while we are making calls to the APM BIOS as a measure to lessen the effects of a badly behaving BIOS implementation. The BIOS should reenable interrupts if it @@ -2611,7 +2611,7 @@ choice prompt "PCI access mode" depends on X86_32 && PCI default PCI_GOANY - ---help--- + help On PCI systems, the BIOS can be used to detect the PCI devices and determine their configuration. However, some old PCI motherboards have BIOS bugs and may crash if this is done. Also, some embedded @@ -2708,7 +2708,7 @@ if X86_32 config ISA bool "ISA support" - ---help--- + help Find out whether you have ISA slots on your motherboard. ISA is the name of a bus system, i.e. the way the CPU talks to the other stuff inside your box. Other bus systems are PCI, EISA, MicroChannel @@ -2717,7 +2717,7 @@ config ISA config SCx200 tristate "NatSemi SCx200 support" - ---help--- + help This provides basic support for National Semiconductor's (now AMD's) Geode processors. The driver probes for the PCI-IDs of several on-chip devices, so its a good dependency @@ -2729,7 +2729,7 @@ config SCx200HR_TIMER tristate "NatSemi SCx200 27MHz High-Resolution Timer Support" depends on SCx200 default y - ---help--- + help This driver provides a clocksource built upon the on-chip 27MHz high-resolution timer. Its also a workaround for NSC Geode SC-1100's buggy TSC, which loses time when the @@ -2744,20 +2744,20 @@ config OLPC select OF_PROMTREE select IRQ_DOMAIN select OLPC_EC - ---help--- + help Add support for detecting the unique features of the OLPC XO hardware. config OLPC_XO1_PM bool "OLPC XO-1 Power Management" depends on OLPC && MFD_CS5535=y && PM_SLEEP - ---help--- + help Add support for poweroff and suspend of the OLPC XO-1 laptop. config OLPC_XO1_RTC bool "OLPC XO-1 Real Time Clock" depends on OLPC_XO1_PM && RTC_DRV_CMOS - ---help--- + help Add support for the XO-1 real time clock, which can be used as a programmable wakeup source. @@ -2766,7 +2766,7 @@ config OLPC_XO1_SCI depends on OLPC && OLPC_XO1_PM && GPIO_CS5535=y depends on INPUT=y select POWER_SUPPLY - ---help--- + help Add support for SCI-based features of the OLPC XO-1 laptop: - EC-driven system wakeups - Power button @@ -2779,7 +2779,7 @@ config OLPC_XO15_SCI bool "OLPC XO-1.5 SCI extras" depends on OLPC && ACPI select POWER_SUPPLY - ---help--- + help Add support for SCI-based features of the OLPC XO-1.5 laptop: - EC-driven system wakeups - AC adapter status updates @@ -2788,7 +2788,7 @@ config OLPC_XO15_SCI config ALIX bool "PCEngines ALIX System Support (LED setup)" select GPIOLIB - ---help--- + help This option enables system support for the PCEngines ALIX. At present this just sets up LEDs for GPIO control on ALIX2/3/6 boards. However, other system specific setup should @@ -2802,14 +2802,14 @@ config ALIX config NET5501 bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)" select GPIOLIB - ---help--- + help This option enables system support for the Soekris Engineering net5501. config GEOS bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)" select GPIOLIB depends on DMI - ---help--- + help This option enables system support for the Traverse Technologies GEOS. config TS5500 @@ -2818,7 +2818,7 @@ config TS5500 select CHECK_SIGNATURE select NEW_LEDS select LEDS_CLASS - ---help--- + help This option enables system support for the Technologic Systems TS-5500. endif # X86_32 @@ -2865,7 +2865,7 @@ config IA32_EMULATION select BINFMT_ELF select COMPAT_BINFMT_ELF select COMPAT_OLD_SIGACTION - ---help--- + help Include code to run legacy 32-bit programs under a 64-bit kernel. You should likely turn this on, unless you're 100% sure that you don't have any 32-bit programs left. @@ -2874,13 +2874,13 @@ config IA32_AOUT tristate "IA32 a.out support" depends on IA32_EMULATION depends on BROKEN - ---help--- + help Support old a.out binaries in the 32bit emulation. config X86_X32 bool "x32 ABI for 64-bit mode" depends on X86_64 - ---help--- + help Include code to run binaries for the x32 native 32-bit ABI for 64-bit processors. An x32 process gets access to the full 64-bit register file and wide data path while leaving diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index bc3a497c029c..814fe0d349b0 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -4,7 +4,7 @@ choice prompt "Processor family" default M686 if X86_32 default GENERIC_CPU if X86_64 - ---help--- + help This is the processor type of your CPU. This information is used for optimizing purposes. In order to compile a kernel that can run on all supported x86 CPU types (albeit not @@ -53,21 +53,21 @@ choice config M486SX bool "486SX" depends on X86_32 - ---help--- + help Select this for an 486-class CPU without an FPU such as AMD/Cyrix/IBM/Intel SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5S. config M486 bool "486DX" depends on X86_32 - ---help--- + help Select this for an 486-class CPU such as AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 and UMC U5D. config M586 bool "586/K5/5x86/6x86/6x86MX" depends on X86_32 - ---help--- + help Select this for an 586 or 686 series processor such as the AMD K5, the Cyrix 5x86, 6x86 and 6x86MX. This choice does not assume the RDTSC (Read Time Stamp Counter) instruction. @@ -75,21 +75,21 @@ config M586 config M586TSC bool "Pentium-Classic" depends on X86_32 - ---help--- + help Select this for a Pentium Classic processor with the RDTSC (Read Time Stamp Counter) instruction for benchmarking. config M586MMX bool "Pentium-MMX" depends on X86_32 - ---help--- + help Select this for a Pentium with the MMX graphics/multimedia extended instructions. config M686 bool "Pentium-Pro" depends on X86_32 - ---help--- + help Select this for Intel Pentium Pro chips. This enables the use of Pentium Pro extended instructions, and disables the init-time guard against the f00f bug found in earlier Pentiums. @@ -97,7 +97,7 @@ config M686 config MPENTIUMII bool "Pentium-II/Celeron(pre-Coppermine)" depends on X86_32 - ---help--- + help Select this for Intel chips based on the Pentium-II and pre-Coppermine Celeron core. This option enables an unaligned copy optimization, compiles the kernel with optimization flags @@ -107,7 +107,7 @@ config MPENTIUMII config MPENTIUMIII bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon" depends on X86_32 - ---help--- + help Select this for Intel chips based on the Pentium-III and Celeron-Coppermine core. This option enables use of some extended prefetch instructions in addition to the Pentium II @@ -116,14 +116,14 @@ config MPENTIUMIII config MPENTIUMM bool "Pentium M" depends on X86_32 - ---help--- + help Select this for Intel Pentium M (not Pentium-4 M) notebook chips. config MPENTIUM4 bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/older Xeon" depends on X86_32 - ---help--- + help Select this for Intel Pentium 4 chips. This includes the Pentium 4, Pentium D, P4-based Celeron and Xeon, and Pentium-4 M (not Pentium M) chips. This option enables compile @@ -159,7 +159,7 @@ config MPENTIUM4 config MK6 bool "K6/K6-II/K6-III" depends on X86_32 - ---help--- + help Select this for an AMD K6-family processor. Enables use of some extended instructions, and passes appropriate optimization flags to GCC. @@ -167,14 +167,14 @@ config MK6 config MK7 bool "Athlon/Duron/K7" depends on X86_32 - ---help--- + help Select this for an AMD Athlon K7-family processor. Enables use of some extended instructions, and passes appropriate optimization flags to GCC. config MK8 bool "Opteron/Athlon64/Hammer/K8" - ---help--- + help Select this for an AMD Opteron or Athlon64 Hammer-family processor. Enables use of some extended instructions, and passes appropriate optimization flags to GCC. @@ -182,7 +182,7 @@ config MK8 config MCRUSOE bool "Crusoe" depends on X86_32 - ---help--- + help Select this for a Transmeta Crusoe processor. Treats the processor like a 586 with TSC, and sets some GCC optimization flags (like a Pentium Pro with no alignment requirements). @@ -190,13 +190,13 @@ config MCRUSOE config MEFFICEON bool "Efficeon" depends on X86_32 - ---help--- + help Select this for a Transmeta Efficeon processor. config MWINCHIPC6 bool "Winchip-C6" depends on X86_32 - ---help--- + help Select this for an IDT Winchip C6 chip. Linux and GCC treat this chip as a 586TSC with some extended instructions and alignment requirements. @@ -204,7 +204,7 @@ config MWINCHIPC6 config MWINCHIP3D bool "Winchip-2/Winchip-2A/Winchip-3" depends on X86_32 - ---help--- + help Select this for an IDT Winchip-2, 2A or 3. Linux and GCC treat this chip as a 586TSC with some extended instructions and alignment requirements. Also enable out of order memory @@ -214,7 +214,7 @@ config MWINCHIP3D config MELAN bool "AMD Elan" depends on X86_32 - ---help--- + help Select this for an AMD Elan processor. Do not use this option for K6/Athlon/Opteron processors! @@ -222,19 +222,19 @@ config MELAN config MGEODEGX1 bool "GeodeGX1" depends on X86_32 - ---help--- + help Select this for a Geode GX1 (Cyrix MediaGX) chip. config MGEODE_LX bool "Geode GX/LX" depends on X86_32 - ---help--- + help Select this for AMD Geode GX and LX processors. config MCYRIXIII bool "CyrixIII/VIA-C3" depends on X86_32 - ---help--- + help Select this for a Cyrix III or C3 chip. Presently Linux and GCC treat this chip as a generic 586. Whilst the CPU is 686 class, it lacks the cmov extension which gcc assumes is present when @@ -246,7 +246,7 @@ config MCYRIXIII config MVIAC3_2 bool "VIA C3-2 (Nehemiah)" depends on X86_32 - ---help--- + help Select this for a VIA C3 "Nehemiah". Selecting this enables usage of SSE and tells gcc to treat the CPU as a 686. Note, this kernel will not boot on older (pre model 9) C3s. @@ -254,14 +254,14 @@ config MVIAC3_2 config MVIAC7 bool "VIA C7" depends on X86_32 - ---help--- + help Select this for a VIA C7. Selecting this uses the correct cache shift and tells gcc to treat the CPU as a 686. config MPSC bool "Intel P4 / older Netburst based Xeon" depends on X86_64 - ---help--- + help Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit which is compatible with x86-64. Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the @@ -271,7 +271,7 @@ config MPSC config MCORE2 bool "Core 2/newer Xeon" - ---help--- + help Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx) CPUs. You can distinguish newer from older Xeons by the CPU @@ -280,7 +280,7 @@ config MCORE2 config MATOM bool "Intel Atom" - ---help--- + help Select this for the Intel Atom platform. Intel Atom CPUs have an in-order pipelining architecture and thus can benefit from @@ -290,7 +290,7 @@ config MATOM config GENERIC_CPU bool "Generic-x86-64" depends on X86_64 - ---help--- + help Generic x86-64 CPU. Run equally well on all x86-64 CPUs. @@ -299,7 +299,7 @@ endchoice config X86_GENERIC bool "Generic x86 support" depends on X86_32 - ---help--- + help Instead of just including optimizations for the selected x86 variant (e.g. PII, Crusoe or Athlon), include some more generic optimizations as well. This will make the kernel @@ -397,14 +397,14 @@ config X86_VMX_FEATURE_NAMES menuconfig PROCESSOR_SELECT bool "Supported processor vendors" if EXPERT - ---help--- + help This lets you choose what x86 vendor support code your kernel will include. config CPU_SUP_INTEL default y bool "Support Intel processors" if PROCESSOR_SELECT - ---help--- + help This enables detection, tunings and quirks for Intel processors You need this enabled if you want your kernel to run on an @@ -418,7 +418,7 @@ config CPU_SUP_CYRIX_32 default y bool "Support Cyrix processors" if PROCESSOR_SELECT depends on M486SX || M486 || M586 || M586TSC || M586MMX || (EXPERT && !64BIT) - ---help--- + help This enables detection, tunings and quirks for Cyrix processors You need this enabled if you want your kernel to run on a @@ -431,7 +431,7 @@ config CPU_SUP_CYRIX_32 config CPU_SUP_AMD default y bool "Support AMD processors" if PROCESSOR_SELECT - ---help--- + help This enables detection, tunings and quirks for AMD processors You need this enabled if you want your kernel to run on an @@ -458,7 +458,7 @@ config CPU_SUP_HYGON config CPU_SUP_CENTAUR default y bool "Support Centaur processors" if PROCESSOR_SELECT - ---help--- + help This enables detection, tunings and quirks for Centaur processors You need this enabled if you want your kernel to run on a @@ -472,7 +472,7 @@ config CPU_SUP_TRANSMETA_32 default y bool "Support Transmeta processors" if PROCESSOR_SELECT depends on !64BIT - ---help--- + help This enables detection, tunings and quirks for Transmeta processors You need this enabled if you want your kernel to run on a @@ -486,7 +486,7 @@ config CPU_SUP_UMC_32 default y bool "Support UMC processors" if PROCESSOR_SELECT depends on M486SX || M486 || (EXPERT && !64BIT) - ---help--- + help This enables detection, tunings and quirks for UMC processors You need this enabled if you want your kernel to run on a diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index fdf1431ac8c2..0dd319e6e5b4 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug @@ -9,7 +9,7 @@ config EARLY_PRINTK_USB config X86_VERBOSE_BOOTUP bool "Enable verbose x86 bootup info messages" default y - ---help--- + help Enables the informational output from the decompression stage (e.g. bzImage) of the boot. If you disable this you will still see errors. Disable this if you want silent bootup. @@ -17,7 +17,7 @@ config X86_VERBOSE_BOOTUP config EARLY_PRINTK bool "Early printk" if EXPERT default y - ---help--- + help Write kernel log output directly into the VGA buffer or to a serial port. @@ -31,7 +31,7 @@ config EARLY_PRINTK_DBGP bool "Early printk via EHCI debug port" depends on EARLY_PRINTK && PCI select EARLY_PRINTK_USB - ---help--- + help Write kernel log output directly into the EHCI debug port. This is useful for kernel debugging when your machine crashes very @@ -44,7 +44,7 @@ config EARLY_PRINTK_USB_XDBC bool "Early printk via the xHCI debug port" depends on EARLY_PRINTK && PCI select EARLY_PRINTK_USB - ---help--- + help Write kernel log output directly into the xHCI debug port. One use for this feature is kernel debugging, for example when your @@ -66,7 +66,7 @@ config EFI_PGT_DUMP bool "Dump the EFI pagetable" depends on EFI select PTDUMP_CORE - ---help--- + help Enable this if you want to dump the EFI page table before enabling virtual mode. This can be used to debug miscellaneous issues with the mapping of the EFI runtime regions into that @@ -75,7 +75,7 @@ config EFI_PGT_DUMP config DEBUG_TLBFLUSH bool "Set upper limit of TLB entries to flush one-by-one" depends on DEBUG_KERNEL - ---help--- + help X86-only for now. @@ -95,7 +95,7 @@ config IOMMU_DEBUG bool "Enable IOMMU debugging" depends on GART_IOMMU && DEBUG_KERNEL depends on X86_64 - ---help--- + help Force the IOMMU to on even when you have less than 4GB of memory and add debugging code. On overflow always panic. And allow to enable IOMMU leak tracing. Can be disabled at boot @@ -110,7 +110,7 @@ config IOMMU_DEBUG config IOMMU_LEAK bool "IOMMU leak tracing" depends on IOMMU_DEBUG && DMA_API_DEBUG - ---help--- + help Add a simple leak tracer to the IOMMU code. This is useful when you are debugging a buggy device driver that leaks IOMMU mappings. @@ -121,7 +121,7 @@ config X86_DECODER_SELFTEST bool "x86 instruction decoder selftest" depends on DEBUG_KERNEL && INSTRUCTION_DECODER depends on !COMPILE_TEST - ---help--- + help Perform x86 instruction decoder selftests at build time. This option is useful for checking the sanity of x86 instruction decoder code. @@ -133,25 +133,25 @@ choice config IO_DELAY_0X80 bool "port 0x80 based port-IO delay [recommended]" - ---help--- + help This is the traditional Linux IO delay used for in/out_p. It is the most tested hence safest selection here. config IO_DELAY_0XED bool "port 0xed based port-IO delay" - ---help--- + help Use port 0xed as the IO delay. This frees up port 0x80 which is often used as a hardware-debug port. config IO_DELAY_UDELAY bool "udelay based port-IO delay" - ---help--- + help Use udelay(2) as the IO delay method. This provides the delay while not having any side-effect on the IO port space. config IO_DELAY_NONE bool "no port-IO delay" - ---help--- + help No port-IO delay. Will break on old boxes that require port-IO delay for certain operations. Should work on most new machines. @@ -161,19 +161,19 @@ config DEBUG_BOOT_PARAMS bool "Debug boot parameters" depends on DEBUG_KERNEL depends on DEBUG_FS - ---help--- + help This option will cause struct boot_params to be exported via debugfs. config CPA_DEBUG bool "CPA self-test code" depends on DEBUG_KERNEL - ---help--- + help Do change_page_attr() self-tests every 30 seconds. config DEBUG_ENTRY bool "Debug low-level entry code" depends on DEBUG_KERNEL - ---help--- + help This option enables sanity checks in x86's low-level entry code. Some of these sanity checks may slow down kernel entries and exits or otherwise impact performance. @@ -183,7 +183,7 @@ config DEBUG_ENTRY config DEBUG_NMI_SELFTEST bool "NMI Selftest" depends on DEBUG_KERNEL && X86_LOCAL_APIC - ---help--- + help Enabling this option turns on a quick NMI selftest to verify that the NMI behaves correctly. @@ -195,7 +195,7 @@ config DEBUG_NMI_SELFTEST config DEBUG_IMR_SELFTEST bool "Isolated Memory Region self test" depends on INTEL_IMR - ---help--- + help This option enables automated sanity testing of the IMR code. Some simple tests are run to verify IMR bounds checking, alignment and overlapping. This option is really only useful if you are @@ -208,7 +208,7 @@ config X86_DEBUG_FPU bool "Debug the x86 FPU code" depends on DEBUG_KERNEL default y - ---help--- + help If this option is enabled then there will be extra sanity checks and (boot time) debug printouts added to the kernel. This debugging adds some small amount of runtime overhead @@ -221,7 +221,7 @@ config PUNIT_ATOM_DEBUG depends on PCI select DEBUG_FS select IOSF_MBI - ---help--- + help This is a debug driver, which gets the power states of all Punit North Complex devices. The power states of each device is exposed as part of the debugfs interface. @@ -232,7 +232,7 @@ choice prompt "Choose kernel unwinder" default UNWINDER_ORC if X86_64 default UNWINDER_FRAME_POINTER if X86_32 - ---help--- + help This determines which method will be used for unwinding kernel stack traces for panics, oopses, bugs, warnings, perf, /proc/<pid>/stack, livepatch, lockdep, and more. @@ -241,7 +241,7 @@ config UNWINDER_ORC bool "ORC unwinder" depends on X86_64 select STACK_VALIDATION - ---help--- + help This option enables the ORC (Oops Rewind Capability) unwinder for unwinding kernel stack traces. It uses a custom data format which is a simplified version of the DWARF Call Frame Information standard. @@ -256,7 +256,7 @@ config UNWINDER_ORC config UNWINDER_FRAME_POINTER bool "Frame pointer unwinder" select FRAME_POINTER - ---help--- + help This option enables the frame pointer unwinder for unwinding kernel stack traces. @@ -268,7 +268,7 @@ config UNWINDER_GUESS bool "Guess unwinder" depends on EXPERT depends on !STACKDEPOT - ---help--- + help This option enables the "guess" unwinder for unwinding kernel stack traces. It scans the stack and reports every kernel text address it finds. Some of the addresses it reports may be incorrect. diff --git a/arch/x86/events/Kconfig b/arch/x86/events/Kconfig index 4a809c6cbd2f..39d9ded9e25a 100644 --- a/arch/x86/events/Kconfig +++ b/arch/x86/events/Kconfig @@ -5,7 +5,7 @@ config PERF_EVENTS_INTEL_UNCORE tristate "Intel uncore performance events" depends on PERF_EVENTS && CPU_SUP_INTEL && PCI default y - ---help--- + help Include support for Intel uncore performance events. These are available on NehalemEX and more modern processors. @@ -13,7 +13,7 @@ config PERF_EVENTS_INTEL_RAPL tristate "Intel/AMD rapl performance events" depends on PERF_EVENTS && (CPU_SUP_INTEL || CPU_SUP_AMD) && PCI default y - ---help--- + help Include support for Intel and AMD rapl performance events for power monitoring on modern processors. @@ -21,14 +21,14 @@ config PERF_EVENTS_INTEL_CSTATE tristate "Intel cstate performance events" depends on PERF_EVENTS && CPU_SUP_INTEL && PCI default y - ---help--- + help Include support for Intel cstate performance events for power monitoring on modern processors. config PERF_EVENTS_AMD_POWER depends on PERF_EVENTS && CPU_SUP_AMD tristate "AMD Processor Power Reporting Mechanism" - ---help--- + help Provide power reporting mechanism support for AMD processors. Currently, it leverages X86_FEATURE_ACC_POWER (CPUID Fn8000_0007_EDX[12]) interface to calculate the diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index d8154e0684b6..b277a2db6267 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -9,7 +9,7 @@ menuconfig VIRTUALIZATION bool "Virtualization" depends on HAVE_KVM || X86 default y - ---help--- + help Say Y here to get to see options for using your Linux host to run other operating systems inside virtual machines (guests). This option alone does not add any kernel code. @@ -45,7 +45,7 @@ config KVM select KVM_GENERIC_DIRTYLOG_READ_PROTECT select KVM_VFIO select SRCU - ---help--- + help Support hosting fully virtualized guest machines using hardware virtualization extensions. You will need a fairly recent processor equipped with virtualization extensions. You will also @@ -75,7 +75,7 @@ config KVM_WERROR config KVM_INTEL tristate "KVM for Intel (and compatible) processors support" depends on KVM && IA32_FEAT_CTL - ---help--- + help Provides support for KVM on processors equipped with Intel's VT extensions, a.k.a. Virtual Machine Extensions (VMX). @@ -85,7 +85,7 @@ config KVM_INTEL config KVM_AMD tristate "KVM for AMD processors support" depends on KVM - ---help--- + help Provides support for KVM on AMD processors equipped with the AMD-V (SVM) extensions. @@ -97,13 +97,13 @@ config KVM_AMD_SEV bool "AMD Secure Encrypted Virtualization (SEV) support" depends on KVM_AMD && X86_64 depends on CRYPTO_DEV_SP_PSP && !(KVM_AMD=y && CRYPTO_DEV_CCP_DD=m) - ---help--- + help Provides support for launching Encrypted VMs on AMD processors. config KVM_MMU_AUDIT bool "Audit KVM MMU" depends on KVM && TRACEPOINTS - ---help--- + help This option adds a R/W kVM module parameter 'mmu_audit', which allows auditing of KVM MMU events at runtime. diff --git a/arch/x86/ras/Kconfig b/arch/x86/ras/Kconfig index 9ad6842de4b4..7488c715427e 100644 --- a/arch/x86/ras/Kconfig +++ b/arch/x86/ras/Kconfig @@ -2,7 +2,7 @@ config RAS_CEC bool "Correctable Errors Collector" depends on X86_MCE && MEMORY_FAILURE && DEBUG_FS - ---help--- + help This is a small cache which collects correctable memory errors per 4K page PFN and counts their repeated occurrence. Once the counter for a PFN overflows, we try to soft-offline that page as we take it to mean |