This series contains some fixes and cleanups for mixed-mode UEFI on x86. Patch #1 adds the missing locking in the runtime service wrapper code for mixed mode. This was found by inspection rather than having been reported but could be a candidate for -stable nonetheless. Patch #2 merges the remaining 32/64-bit specific parts of the setup_efi_pci routine. Patches #3 and #4 do the same for the UGA draw protocol discovery routines. Patch #5 fixes a latent bug in the UGA draw code. Patch #6 helps unused code paths to be optimized away on configurations that don't need them (32-bit only and 64-bit only) Ard Biesheuvel (6): efi/x86: prevent reentrant firmware calls in mixed mode efi/x86: merge setup_efi_pci32 and setup_efi_pci64 routines efi/x86: align efi_uga_draw_protocol typedef names to convention efi/x86: merge 32-bit and 64-bit UGA draw protocol setup routines efi/x86: add missing NULL initialization in UGA draw protocol discovery efi/x86: replace references to efi_early->is64 with efi_is_64bit() arch/x86/boot/compressed/eboot.c | 252 +++++--------------- arch/x86/boot/compressed/eboot.h | 12 +- arch/x86/platform/efi/efi_64.c | 101 +++++++- 3 files changed, 170 insertions(+), 195 deletions(-) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html