From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 31 May 2022 18:07:30 +0000 (+0900)
Subject: boot: use ALIGN4()
X-Git-Tag: v252-rc1~891^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4e7df4a479f13e1cb9e0db29820e6933e610aef;p=thirdparty%2Fsystemd.git

boot: use ALIGN4()
---

diff --git a/src/boot/efi/cpio.c b/src/boot/efi/cpio.c
index 14957130be0..8a2a5afc40d 100644
--- a/src/boot/efi/cpio.c
+++ b/src/boot/efi/cpio.c
@@ -96,12 +96,12 @@ static EFI_STATUS pack_cpio_one(
                 return EFI_OUT_OF_RESOURCES;
 
         /* Align the whole header to 4 byte size */
-        l = ALIGN_TO(l, 4);
+        l = ALIGN4(l);
         if (l == UINTN_MAX) /* overflow check */
                 return EFI_OUT_OF_RESOURCES;
 
         /* Align the contents to 4 byte size */
-        q = ALIGN_TO(contents_size, 4);
+        q = ALIGN4(contents_size);
         if (q == UINTN_MAX) /* overflow check */
                 return EFI_OUT_OF_RESOURCES;
 
@@ -188,7 +188,7 @@ static EFI_STATUS pack_cpio_dir(
         l += path_size;
 
         /* Align the whole header to 4 byte size */
-        l = ALIGN_TO(l, 4);
+        l = ALIGN4(l);
         if (l == UINTN_MAX) /* overflow check */
                 return EFI_OUT_OF_RESOURCES;
 
diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index 40f615b2b36..afcc106b52d 100644
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@ -34,7 +34,7 @@ static EFI_STATUS combine_initrd(
 
         /* Combines four initrds into one, by simple concatenation in memory */
 
-        n = ALIGN_TO(initrd_size, 4); /* main initrd might not be padded yet */
+        n = ALIGN4(initrd_size); /* main initrd might not be padded yet */
         if (credential_initrd) {
                 if (n > UINTN_MAX - credential_initrd_size)
                         return EFI_OUT_OF_RESOURCES;
@@ -71,7 +71,7 @@ static EFI_STATUS combine_initrd(
                 CopyMem(p, PHYSICAL_ADDRESS_TO_POINTER(initrd_base), initrd_size);
                 p += initrd_size;
 
-                pad = ALIGN_TO(initrd_size, 4) - initrd_size;
+                pad = ALIGN4(initrd_size) - initrd_size;
                 if (pad > 0)  {
                         ZeroMem(p, pad);
                         p += pad;