diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 11:04:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 11:04:22 -0400 |
commit | 04ce7fae3d4ed1b045d20da071b96f7dcb93bda8 (patch) | |
tree | 8ffcf93a568a6b323bda93263d6ce44c5e12f7f6 | |
parent | 642116d4ac58745b8058d32a20ca733020feb290 (diff) | |
parent | b3569d3a4b4fe93ee33eaa3c69ec3ed2cd3b276a (diff) |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build update from Ingo Molnar:
"A small cleanup to x86 Kconfigs"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kconfig: Remove redundant 'default n' lines from all x86 Kconfig's
-rw-r--r-- | arch/x86/Kconfig | 7 | ||||
-rw-r--r-- | arch/x86/Kconfig.debug | 1 | ||||
-rw-r--r-- | arch/x86/xen/Kconfig | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 45b94fa9e98c..8282985d438a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -448,7 +448,6 @@ config RETPOLINE | |||
448 | 448 | ||
449 | config INTEL_RDT | 449 | config INTEL_RDT |
450 | bool "Intel Resource Director Technology support" | 450 | bool "Intel Resource Director Technology support" |
451 | default n | ||
452 | depends on X86 && CPU_SUP_INTEL | 451 | depends on X86 && CPU_SUP_INTEL |
453 | select KERNFS | 452 | select KERNFS |
454 | help | 453 | help |
@@ -702,7 +701,6 @@ config STA2X11 | |||
702 | select SWIOTLB | 701 | select SWIOTLB |
703 | select MFD_STA2X11 | 702 | select MFD_STA2X11 |
704 | select GPIOLIB | 703 | select GPIOLIB |
705 | default n | ||
706 | ---help--- | 704 | ---help--- |
707 | This adds support for boards based on the STA2X11 IO-Hub, | 705 | This adds support for boards based on the STA2X11 IO-Hub, |
708 | a.k.a. "ConneXt". The chip is used in place of the standard | 706 | a.k.a. "ConneXt". The chip is used in place of the standard |
@@ -800,7 +798,6 @@ config KVM_GUEST | |||
800 | config KVM_DEBUG_FS | 798 | config KVM_DEBUG_FS |
801 | bool "Enable debug information for KVM Guests in debugfs" | 799 | bool "Enable debug information for KVM Guests in debugfs" |
802 | depends on KVM_GUEST && DEBUG_FS | 800 | depends on KVM_GUEST && DEBUG_FS |
803 | default n | ||
804 | ---help--- | 801 | ---help--- |
805 | This option enables collection of various statistics for KVM guest. | 802 | This option enables collection of various statistics for KVM guest. |
806 | Statistics are displayed in debugfs filesystem. Enabling this option | 803 | Statistics are displayed in debugfs filesystem. Enabling this option |
@@ -809,7 +806,6 @@ config KVM_DEBUG_FS | |||
809 | config PARAVIRT_TIME_ACCOUNTING | 806 | config PARAVIRT_TIME_ACCOUNTING |
810 | bool "Paravirtual steal time accounting" | 807 | bool "Paravirtual steal time accounting" |
811 | depends on PARAVIRT | 808 | depends on PARAVIRT |
812 | default n | ||
813 | ---help--- | 809 | ---help--- |
814 | Select this option to enable fine granularity task steal time | 810 | Select this option to enable fine granularity task steal time |
815 | accounting. Time spent executing other tasks in parallel with | 811 | accounting. Time spent executing other tasks in parallel with |
@@ -1169,7 +1165,6 @@ source "arch/x86/events/Kconfig" | |||
1169 | 1165 | ||
1170 | config X86_LEGACY_VM86 | 1166 | config X86_LEGACY_VM86 |
1171 | bool "Legacy VM86 support" | 1167 | bool "Legacy VM86 support" |
1172 | default n | ||
1173 | depends on X86_32 | 1168 | depends on X86_32 |
1174 | ---help--- | 1169 | ---help--- |
1175 | This option allows user programs to put the CPU into V8086 | 1170 | This option allows user programs to put the CPU into V8086 |
@@ -2221,7 +2216,6 @@ config HOTPLUG_CPU | |||
2221 | 2216 | ||
2222 | config BOOTPARAM_HOTPLUG_CPU0 | 2217 | config BOOTPARAM_HOTPLUG_CPU0 |
2223 | bool "Set default setting of cpu0_hotpluggable" | 2218 | bool "Set default setting of cpu0_hotpluggable" |
2224 | default n | ||
2225 | depends on HOTPLUG_CPU | 2219 | depends on HOTPLUG_CPU |
2226 | ---help--- | 2220 | ---help--- |
2227 | Set whether default state of cpu0_hotpluggable is on or off. | 2221 | Set whether default state of cpu0_hotpluggable is on or off. |
@@ -2826,7 +2820,6 @@ source "drivers/pcmcia/Kconfig" | |||
2826 | config RAPIDIO | 2820 | config RAPIDIO |
2827 | tristate "RapidIO support" | 2821 | tristate "RapidIO support" |
2828 | depends on PCI | 2822 | depends on PCI |
2829 | default n | ||
2830 | help | 2823 | help |
2831 | If enabled this option will include drivers and the core | 2824 | If enabled this option will include drivers and the core |
2832 | infrastructure code to support RapidIO interconnect devices. | 2825 | infrastructure code to support RapidIO interconnect devices. |
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 7d68f0c7cfb1..0723dff17e6c 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
@@ -314,7 +314,6 @@ config DEBUG_NMI_SELFTEST | |||
314 | 314 | ||
315 | config DEBUG_IMR_SELFTEST | 315 | config DEBUG_IMR_SELFTEST |
316 | bool "Isolated Memory Region self test" | 316 | bool "Isolated Memory Region self test" |
317 | default n | ||
318 | depends on INTEL_IMR | 317 | depends on INTEL_IMR |
319 | ---help--- | 318 | ---help--- |
320 | This option enables automated sanity testing of the IMR code. | 319 | This option enables automated sanity testing of the IMR code. |
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index c1f98f32c45f..14be6a5935e1 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig | |||
@@ -68,7 +68,6 @@ config XEN_SAVE_RESTORE | |||
68 | config XEN_DEBUG_FS | 68 | config XEN_DEBUG_FS |
69 | bool "Enable Xen debug and tuning parameters in debugfs" | 69 | bool "Enable Xen debug and tuning parameters in debugfs" |
70 | depends on XEN && DEBUG_FS | 70 | depends on XEN && DEBUG_FS |
71 | default n | ||
72 | help | 71 | help |
73 | Enable statistics output and various tuning options in debugfs. | 72 | Enable statistics output and various tuning options in debugfs. |
74 | Enabling this option may incur a significant performance overhead. | 73 | Enabling this option may incur a significant performance overhead. |