Commit 8cf126d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Peter Anvin:
 "There is a small EFI fix and a big power regression fix in this batch.

  My queue also had a fix for downing a CPU when there are insufficient
  number of IRQ vectors available, but I'm holding that one for now due
  to recent bug reports"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Don't select EFI from certain special ACPI drivers
  x86 idle: Repair large-server 50-watt idle-power regression
parents bddffa28 fce7d3bf

arch/x86/kernel/cpu/intel.c

+2 −1
Original line number Diff line number Diff line
@@ -387,7 +387,8 @@ static void init_intel(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, X86_FEATURE_PEBS);

	}



	if (c->x86 == 6 && c->x86_model == 29 && cpu_has_clflush)

	if (c->x86 == 6 && cpu_has_clflush &&

	    (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47))

		set_cpu_cap(c, X86_FEATURE_CLFLUSH_MONITOR);



#ifdef CONFIG_X86_64

drivers/acpi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ source "drivers/acpi/apei/Kconfig" 
config ACPI_EXTLOG

	tristate "Extended Error Log support"

	depends on X86_MCE && X86_LOCAL_APIC

	select EFI

	select UEFI_CPER

	default n

	help

drivers/acpi/apei/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config ACPI_APEI 
	bool "ACPI Platform Error Interface (APEI)"

	select MISC_FILESYSTEMS

	select PSTORE

	select EFI

	select UEFI_CPER

	depends on X86

	help

drivers/firmware/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o 


obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/

obj-$(CONFIG_EFI)		+= efi/

obj-$(CONFIG_UEFI_CPER)		+= efi/

drivers/firmware/efi/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ config EFI_VARS_PSTORE_DEFAULT_DISABLE 
	  backend for pstore by default. This setting can be overridden

	  using the efivars module's pstore_disable parameter.



config UEFI_CPER

	def_bool n



endmenu



config UEFI_CPER

	bool

CRA Git | Maintained and supported by SUSTech CRA and CCSE