From: Daniel Kiper <daniel.kiper@oracle.com>
Date: Tue, 5 Dec 2017 16:16:04 +0000 (+0100)
Subject: efi: use ROUNDUP() macro instead of open code
X-Git-Tag: 4.11.0-rc1~789
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3dec344d89cfe7ab62e680769e73f7975e122454;p=xen.git

efi: use ROUNDUP() macro instead of open code

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 01d33004e0..469bf980cc 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -176,7 +176,7 @@ static void __init __maybe_unused *ebmalloc(size_t size)
 {
     void *ptr = ebmalloc_mem + ebmalloc_allocated;
 
-    ebmalloc_allocated += (size + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
+    ebmalloc_allocated += ROUNDUP(size, sizeof(void *));
 
     if ( ebmalloc_allocated > sizeof(ebmalloc_mem) )
         blexit(L"Out of static memory\r\n");