Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5945fba8 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 changes from Ingo Molnar:
 "Small cleanups and fixes"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text
  x86/build/defconfig: Enable USB_EHCI_TT_NEWSCHED=y
  x86/build: Fix mkcapflags.sh bash-ism
  x86/Kconfig: Simplify X86_UP_APIC handling
  x86/Kconfig: Simplify X86_IO_APIC dependencies
  x86/Kconfig: Avoid issuing pointless turned off entries to .config
parents 8f74bc5f d8eb8940

arch/x86/Kconfig

+13 −21
Original line number Diff line number Diff line
@@ -235,12 +235,10 @@ config ARCH_WANT_GENERAL_HUGETLB 
	def_bool y



config ZONE_DMA32

	bool

	default X86_64

	def_bool y if X86_64



config AUDIT_ARCH

	bool

	default X86_64

	def_bool y if X86_64



config ARCH_SUPPORTS_OPTIMIZED_INLINING

	def_bool y
@@ -891,7 +889,8 @@ config UP_LATE_INIT 
       depends on !SMP && X86_LOCAL_APIC



config X86_UP_APIC

	bool "Local APIC support on uniprocessors"

	bool "Local APIC support on uniprocessors" if !PCI_MSI

	default PCI_MSI

	depends on X86_32 && !SMP && !X86_32_NON_STANDARD

	---help---

	  A local APIC (Advanced Programmable Interrupt Controller) is an
@@ -903,10 +902,6 @@ config X86_UP_APIC 
	  performance counters), and the NMI watchdog which detects hard

	  lockups.



config X86_UP_APIC_MSI

	def_bool y

	select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI



config X86_UP_IOAPIC

	bool "IO-APIC support on uniprocessors"

	depends on X86_UP_APIC
@@ -925,8 +920,8 @@ config X86_LOCAL_APIC 
	select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ



config X86_IO_APIC

	def_bool X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC

	depends on X86_LOCAL_APIC

	def_bool y

	depends on X86_LOCAL_APIC || X86_UP_IOAPIC

	select IRQ_DOMAIN



config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
@@ -1145,10 +1140,10 @@ config MICROCODE_OLD_INTERFACE 
	depends on MICROCODE



config MICROCODE_INTEL_EARLY

	def_bool n

	bool



config MICROCODE_AMD_EARLY

	def_bool n

	bool



config MICROCODE_EARLY

	bool "Early load microcode"
@@ -1747,14 +1742,11 @@ config KEXEC_VERIFY_SIG 
	depends on KEXEC_FILE

	---help---

	  This option makes kernel signature verification mandatory for

	  kexec_file_load() syscall. If kernel is signature can not be

	  verified, kexec_file_load() will fail.



	  This option enforces signature verification at generic level.

	  One needs to enable signature verification for type of kernel

	  image being loaded to make sure it works. For example, enable

	  bzImage signature verification option to be able to load and

	  verify signatures of bzImage. Otherwise kernel loading will fail.

	  the kexec_file_load() syscall.



	  In addition to that option, you need to enable signature

	  verification for the corresponding kernel image type being

	  loaded in order for this to work.



config KEXEC_BZIMAGE_VERIFY_SIG

	bool "Enable bzImage signature verification support"

arch/x86/configs/i386_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ CONFIG_USB=y 
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_TT_NEWSCHED=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_UHCI_HCD=y

CONFIG_USB_PRINTER=y

arch/x86/configs/x86_64_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ CONFIG_USB=y 
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_TT_NEWSCHED=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_UHCI_HCD=y

CONFIG_USB_PRINTER=y

arch/x86/kernel/cpu/mkcapflags.sh

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
IN=$1

OUT=$2



function dump_array()

dump_array()

{

	ARRAY=$1

	SIZE=$2