summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-24 20:16:17 +0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-24 20:16:17 +0800
commit64dd76559d4ba281f020af7c87f16071394d1f70 (patch)
tree1a8e4108043c2ade8dc96c2ce07234a5af84e5e2 /arch
parentd3a6749c3364d576e9b8515ccfb14ce57cf3b9b2 (diff)
parent2e6eb40ca5eb53836d18f3b9ac61ff2e0b417038 (diff)
downloadlinux-stable-64dd76559d4ba281f020af7c87f16071394d1f70.tar.gz
linux-stable-64dd76559d4ba281f020af7c87f16071394d1f70.tar.bz2
linux-stable-64dd76559d4ba281f020af7c87f16071394d1f70.zip
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Thomas Gleixner: "Two fixlets for the EFI maze: - Properly zero variables to prevent an early boot hang on EFI mixed mode systems - Fix the fallout of merging the 32bit and 64bit variants of EFI PCI related code which ended up chosing the 32bit variant of the actual EFi call invocation which leads to failures on 64bit" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/x86: Fix incorrect invocation of PciIo->Attributes() efi/libstub/tpm: Initialize efi_physical_addr_t vars to zero for mixed mode
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/compressed/eboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index a8a8642d2b0b..e57665b4ba1c 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -118,7 +118,7 @@ __setup_efi_pci(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom)
void *romimage;
status = efi_call_proto(efi_pci_io_protocol, attributes, pci,
- EfiPciIoAttributeOperationGet, 0, 0,
+ EfiPciIoAttributeOperationGet, 0ULL,
&attributes);
if (status != EFI_SUCCESS)
return status;