:: commit 8309c20ab0e9c08685fe47cf6325d869eeff2b27

diff --git a/common/mm/pmm.s2.c b/common/mm/pmm.s2.c
index f4ab3771..1a86b3a4 100644
--- a/common/mm/pmm.s2.c
+++ b/common/mm/pmm.s2.c
@@ -630,9 +630,8 @@ void *ext_mem_alloc_type_aligned_mode(uint64_t count, uint32_t type, size_t alig
     (void)allow_high_allocs;
 #endif
 
-    if (__builtin_add_overflow(count, alignment - 1, &count)) {
-        panic(false, "ext_mem_alloc: count overflows when aligning");
-    }
+    count = CHECKED_ADD(count, alignment - 1,
+        panic(false, "ext_mem_alloc: count overflows when aligning"));
     count = ALIGN_DOWN(count, alignment);
 
     if (allocations_disallowed)