diff --git a/grub-core/mmap/efi/mmap.c b/grub-core/mmap/efi/mmap.c
index 8e5cce0d0..b34a3ba30 100644
--- a/grub-core/mmap/efi/mmap.c
+++ b/grub-core/mmap/efi/mmap.c
@@ -272,7 +272,7 @@ grub_mmap_malign_and_register (grub_uint64_t align __attribute__ ((unused)),
   overlays = curover;
   *handle = curover->handle;
 
-  return UINT_TO_PTR (curover->address);
+  return (void *) (grub_addr_t) curover->address;
 }
 
 void