efi/libstub: Cast away type warning in use of max()

ardbiesheuvel · ardbiesheuvel · commit 61d130f261a3 · 2024-03-28T16:18:57.000+01:00
Avoid a type mismatch warning in max() by switching to max_t() and providing the type explicitly. Fixes: 3cb4a48 ("efi/libstub: fix efi_random_alloc() ...") Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
diff --git a/drivers/firmware/efi/libstub/randomalloc.c b/drivers/firmware/efi/libstub/randomalloc.c
@@ -120,7 +120,7 @@ efi_status_t efi_random_alloc(unsigned long size,
 			continue;
 		}
 
-		target = round_up(max(md->phys_addr, alloc_min), align) + target_slot * align;
+		target = round_up(max_t(u64, md->phys_addr, alloc_min), align) + target_slot * align;
 		pages = size / EFI_PAGE_SIZE;
 
 		status = efi_bs_call(allocate_pages, EFI_ALLOCATE_ADDRESS,

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ efi_status_t efi_random_alloc(unsigned long size,`
`120`	`120`	`continue;`
`121`	`121`	`}`
`122`	`122`
`123`		`- target = round_up(max(md->phys_addr, alloc_min), align) + target_slot * align;`
	`123`	`+ target = round_up(max_t(u64, md->phys_addr, alloc_min), align) + target_slot * align;`
`124`	`124`	`pages = size / EFI_PAGE_SIZE;`
`125`	`125`
`126`	`126`	`status = efi_bs_call(allocate_pages, EFI_ALLOCATE_ADDRESS,`