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

Commit fce7d3bf authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86/efi: Don't select EFI from certain special ACPI drivers 



Commit 7ea6c6c1 ("Move cper.c from drivers/acpi/apei to
drivers/firmware/efi") results in CONFIG_EFI being enabled even
when the user doesn't want this. Since ACPI APEI used to build
fine without UEFI (and as far as I know also has no functional
depency on it), at least in that case using a reverse dependency
is wrong (and a straight one isn't needed).

Whether the same is true for ACPI_EXTLOG I don't know - if there
is a functional dependency, it should depend on EFI rather than
selecting it. It certainly has (currently) no build dependency.

Adjust Kconfig and build logic so that the bad dependency gets
avoided.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/52AF1EBC020000780010DBF9@nat28.tlf.novell.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 40e2d7f9

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

drivers/firmware/efi/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Makefile for linux kernel

#

obj-y					+= efi.o vars.o

obj-$(CONFIG_EFI)			+= efi.o vars.o

obj-$(CONFIG_EFI_VARS)			+= efivars.o

obj-$(CONFIG_EFI_VARS_PSTORE)		+= efi-pstore.o

obj-$(CONFIG_UEFI_CPER)			+= cper.o