diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 23:42:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 23:42:16 +0300 |
| commit | 8139548136d966863751a6e5ce8a19d08c4f374a (patch) | |
| tree | 9c42f05734e867db8729b37224d978b5a434714f /arch/x86/boot/compressed/Makefile | |
| parent | 206f18f2caaf965870ff558e237e9c23164a66f0 (diff) | |
| parent | 595247f61f9840222a4dec4baefd66ad6d5b0d6a (diff) | |
| download | linux-8139548136d966863751a6e5ce8a19d08c4f374a.tar.xz | |
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar:
"Changes in this cycle are:
- support module unload for efivarfs (Mathias Krause)
- another attempt at moving x86 to libstub taking advantage of the
__pure attribute (Ard Biesheuvel)
- add EFI runtime services section to ptdump (Mathias Krause)"
* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, ptdump: Add section for EFI runtime services
efi/x86: Move x86 back to libstub
efivarfs: Allow unloading when build as module
Diffstat (limited to 'arch/x86/boot/compressed/Makefile')
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 65516ab0cabe..d999398928bc 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -47,7 +47,8 @@ vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone -vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o +vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \ + $(objtree)/drivers/firmware/efi/libstub/lib.a $(obj)/vmlinux: $(vmlinux-objs-y) FORCE $(call if_changed,ld) |