Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 EFI fixes from Peter Anvin: "This is a collection of fixes for the EFI support. The controversial bit here is a set of patches which bumps the boot protocol version as part of fixing some serious problems with the EFI handover protocol, used when booting under EFI using a bootloader as opposed to directly from EFI. These changes should also make it a lot saner to support cross-mode 32/64-bit EFI booting in the future. Getting these changes into 3.8 means we avoid presenting an inconsistent ABI to bootloaders. Other changes are display detection and fixing efivarfs." * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, efi: remove attribute check from setup_efi_pci x86, build: Dynamically find entry points in compressed startup code x86, efi: Fix PCI ROM handing in EFI boot stub, in 32-bit mode x86, efi: Fix 32-bit EFI handover protocol entry point x86, efi: Fix display detection in EFI boot stub x86, boot: Define the 2.12 bzImage boot protocol x86/boot: Fix minor fd leakage in tools/relocs.c x86, efi: Set runtime_version to the EFI spec revision x86, efi: fix 32-bit warnings in setup_efi_pci() efivarfs: Delete dentry from dcache in efivarfs_file_write() efivarfs: Never return ENOENT from firmware efi, x86: Pass a proper identity mapping in efi_call_phys_prelog efivarfs: Drop link count of the right inode
Showing
- Documentation/x86/boot.txt 26 additions, 1 deletionDocumentation/x86/boot.txt
- Documentation/x86/zero-page.txt 4 additions, 0 deletionsDocumentation/x86/zero-page.txt
- arch/x86/boot/Makefile 2 additions, 2 deletionsarch/x86/boot/Makefile
- arch/x86/boot/compressed/eboot.c 11 additions, 10 deletionsarch/x86/boot/compressed/eboot.c
- arch/x86/boot/compressed/head_32.S 5 additions, 3 deletionsarch/x86/boot/compressed/head_32.S
- arch/x86/boot/compressed/head_64.S 4 additions, 4 deletionsarch/x86/boot/compressed/head_64.S
- arch/x86/boot/header.S 29 additions, 10 deletionsarch/x86/boot/header.S
- arch/x86/boot/setup.ld 1 addition, 1 deletionarch/x86/boot/setup.ld
- arch/x86/boot/tools/build.c 63 additions, 18 deletionsarch/x86/boot/tools/build.c
- arch/x86/include/uapi/asm/bootparam.h 46 additions, 17 deletionsarch/x86/include/uapi/asm/bootparam.h
- arch/x86/platform/efi/efi.c 1 addition, 1 deletionarch/x86/platform/efi/efi.c
- arch/x86/platform/efi/efi_64.c 17 additions, 5 deletionsarch/x86/platform/efi/efi_64.c
- arch/x86/tools/relocs.c 4 additions, 2 deletionsarch/x86/tools/relocs.c
- drivers/firmware/efivars.c 3 additions, 2 deletionsdrivers/firmware/efivars.c
Loading
Please register or sign in to comment