efi: arm: force use of unsigned type for EFI_PHYS_ALIGN
Subsystems (2)
Ard Biesheuvel
maintainerPATCH 1/1 efi: arm: force use of unsigned type for EFI_PHYS_ALIGN
Ensure that EFI_PHYS_ALIGN is an unsigned type, to prevent spurious warnings from the type checks in the definition of the max() macro.
Signed-off-by Ard Biesheuvel <[email protected]>
--- arch/arm/include/asm/efi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/efi.h +1 -1
@@ -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)
Signature · 1 line
2.20.1
The following commit has been merged into the efi/core branch of tip:
The following commit has been merged into the efi/core branch of tip:
Commit-ID: d72c8b0e1cacc39495cd413433d260e8ae59374a Gitweb: https://git.kernel.org/tip/d72c8b0e1cacc39495cd413433d260e8ae59374a Author: Ard Biesheuvel <[email protected]> AuthorDate: Sun, 13 Dec 2020 16:07:03 +01:00 Committer: Ard Biesheuvel <[email protected]> CommitterDate: Mon, 14 Dec 2020 16:25:06 +01:00
efi: arm: force use of unsigned type for EFI_PHYS_ALIGN
Ensure that EFI_PHYS_ALIGN is an unsigned type, to prevent spurious warnings from the type checks in the definition of the max() macro.
Signed-off-by Ard Biesheuvel <[email protected]>
--- arch/arm/include/asm/efi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/efi.h +1 -1
@@ -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)