diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-12-15 12:14:38 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-12-15 12:14:38 +0100 |
| commit | 3dcb8b53cbd2cc5618863b19ef00f8ea82f27e83 (patch) | |
| tree | 83017fb4ceb0c01a83a4ac42cd38494b3f8e8807 /arch/arm/include/asm | |
| parent | 54649911f31b6e7c2a79a1426ca98259139e4c35 (diff) | |
| parent | d72c8b0e1cacc39495cd413433d260e8ae59374a (diff) | |
Merge tag 'efi-next-for-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core
Pull followup fixes for EFI from Ard Biesheuvel:
- fix the build breakage on IA64 caused by recent capsule loader changes
- suppress a type mismatch build warning in the expansion of
EFI_PHYS_ALIGN on ARM
Link: https://lore.kernel.org/r/20201215080144.17077-1-ardb@kernel.org
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h index abae071a02e1..9de7ab2ce05d 100644 --- a/arch/arm/include/asm/efi.h +++ b/arch/arm/include/asm/efi.h @@ -71,7 +71,7 @@ static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) * here throws off the memory allocation logic, so let's use the lowest power * of two greater than 2 MiB and greater than TEXT_OFFSET. */ -#define EFI_PHYS_ALIGN max(SZ_2M, roundup_pow_of_two(TEXT_OFFSET)) +#define EFI_PHYS_ALIGN max(UL(SZ_2M), roundup_pow_of_two(TEXT_OFFSET)) /* on ARM, the initrd should be loaded in a lowmem region */ static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr) |