Commit 04ce7fae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 642116d4 b3569d3a

arch/x86/Kconfig

+0 −7
Original line number Original line Diff line number Diff line
@@ -448,7 +448,6 @@ config RETPOLINE 




config INTEL_RDT

config INTEL_RDT

	bool "Intel Resource Director Technology support"

	bool "Intel Resource Director Technology support"

	default n

	depends on X86 && CPU_SUP_INTEL

	depends on X86 && CPU_SUP_INTEL

	select KERNFS

	select KERNFS

	help

	help
@@ -702,7 +701,6 @@ config STA2X11 
	select SWIOTLB

	select SWIOTLB

	select MFD_STA2X11

	select MFD_STA2X11

	select GPIOLIB

	select GPIOLIB

	default n

	---help---

	---help---

	  This adds support for boards based on the STA2X11 IO-Hub,

	  This adds support for boards based on the STA2X11 IO-Hub,

	  a.k.a. "ConneXt". The chip is used in place of the standard

	  a.k.a. "ConneXt". The chip is used in place of the standard
@@ -800,7 +798,6 @@ config KVM_GUEST 
config KVM_DEBUG_FS

config KVM_DEBUG_FS

	bool "Enable debug information for KVM Guests in debugfs"

	bool "Enable debug information for KVM Guests in debugfs"

	depends on KVM_GUEST && DEBUG_FS

	depends on KVM_GUEST && DEBUG_FS

	default n

	---help---

	---help---

	  This option enables collection of various statistics for KVM guest.

	  This option enables collection of various statistics for KVM guest.

	  Statistics are displayed in debugfs filesystem. Enabling this option

	  Statistics are displayed in debugfs filesystem. Enabling this option
@@ -809,7 +806,6 @@ config KVM_DEBUG_FS 
config PARAVIRT_TIME_ACCOUNTING

config PARAVIRT_TIME_ACCOUNTING

	bool "Paravirtual steal time accounting"

	bool "Paravirtual steal time accounting"

	depends on PARAVIRT

	depends on PARAVIRT

	default n

	---help---

	---help---

	  Select this option to enable fine granularity task steal time

	  Select this option to enable fine granularity task steal time

	  accounting. Time spent executing other tasks in parallel with

	  accounting. Time spent executing other tasks in parallel with
@@ -1169,7 +1165,6 @@ source "arch/x86/events/Kconfig" 




config X86_LEGACY_VM86

config X86_LEGACY_VM86

	bool "Legacy VM86 support"

	bool "Legacy VM86 support"

	default n

	depends on X86_32

	depends on X86_32

	---help---

	---help---

	  This option allows user programs to put the CPU into V8086

	  This option allows user programs to put the CPU into V8086
@@ -2221,7 +2216,6 @@ config HOTPLUG_CPU 




config BOOTPARAM_HOTPLUG_CPU0

config BOOTPARAM_HOTPLUG_CPU0

	bool "Set default setting of cpu0_hotpluggable"

	bool "Set default setting of cpu0_hotpluggable"

	default n

	depends on HOTPLUG_CPU

	depends on HOTPLUG_CPU

	---help---

	---help---

	  Set whether default state of cpu0_hotpluggable is on or off.

	  Set whether default state of cpu0_hotpluggable is on or off.
@@ -2826,7 +2820,6 @@ source "drivers/pcmcia/Kconfig" 
config RAPIDIO

config RAPIDIO

	tristate "RapidIO support"

	tristate "RapidIO support"

	depends on PCI

	depends on PCI

	default n

	help

	help

	  If enabled this option will include drivers and the core

	  If enabled this option will include drivers and the core

	  infrastructure code to support RapidIO interconnect devices.

	  infrastructure code to support RapidIO interconnect devices.

arch/x86/Kconfig.debug

+0 −1
Original line number Original line Diff line number Diff line
@@ -314,7 +314,6 @@ config DEBUG_NMI_SELFTEST 




config DEBUG_IMR_SELFTEST

config DEBUG_IMR_SELFTEST

	bool "Isolated Memory Region self test"

	bool "Isolated Memory Region self test"

	default n

	depends on INTEL_IMR

	depends on INTEL_IMR

	---help---

	---help---

	  This option enables automated sanity testing of the IMR code.

	  This option enables automated sanity testing of the IMR code.

arch/x86/xen/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,6 @@ config XEN_SAVE_RESTORE 
config XEN_DEBUG_FS

config XEN_DEBUG_FS

	bool "Enable Xen debug and tuning parameters in debugfs"

	bool "Enable Xen debug and tuning parameters in debugfs"

	depends on XEN && DEBUG_FS

	depends on XEN && DEBUG_FS

	default n

	help

	help

	  Enable statistics output and various tuning options in debugfs.

	  Enable statistics output and various tuning options in debugfs.

	  Enabling this option may incur a significant performance overhead.

	  Enabling this option may incur a significant performance overhead.

CRA Git | Maintained and supported by SUSTech CRA and CCSE