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

Commit 90e01058 authored Oct 22, 2016 by Linus Torvalds

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

Pull EFI fixes from Ingo Molnar:
 "Add Ard Biesheuvel as EFI co-maintainer, plus fix an ARM build bug
  with older toolchains"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/arm: Fix absolute relocation detection for older toolchains
  MAINTAINERS: Add myself as EFI maintainer

parents dcd4693c b0dddf6c

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -4620,8 +4620,9 @@ F: sound/usb/misc/ua101.c

		EXTENSIBLE FIRMWARE INTERFACE (EFI)
		M: Matt Fleming <matt@codeblueprint.co.uk>
		M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
		L: linux-efi@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
		S: Maintained
		F: Documentation/efi-stub.txt
		F: arch/ia64/kernel/efi.c

drivers/firmware/efi/libstub/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 \
		-mno-mmx -mno-sse

		cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS))
		cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \
		cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) -g0 \
		-fno-builtin -fpic -mno-single-pic-base

		cflags-$(CONFIG_EFI_ARMSTUB) += -I$(srctree)/scripts/dtc/libfdt
		@@ -79,5 +79,6 @@ quiet_cmd_stubcopy = STUBCPY $@
		# decompressor. So move our .data to .data.efistub, which is preserved
		# explicitly by the decompressor linker script.
		#
		STUBCOPY_FLAGS-$(CONFIG_ARM) += --rename-section .data=.data.efistub
		STUBCOPY_FLAGS-$(CONFIG_ARM) += --rename-section .data=.data.efistub \
		-R ___ksymtab+sort -R ___kcrctab+sort
		STUBCOPY_RELOC-$(CONFIG_ARM) := R_ARM_ABS