From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 1 Jun 2022 05:51:44 +0000 (+0900)
Subject: Merge pull request #23531 from yuwata/sd-bus-drop-version-2
X-Git-Tag: v252-rc1~891
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9db25d01efe2ae082c11f017b028d2c4ee7fa16d;p=thirdparty%2Fsystemd.git

Merge pull request #23531 from yuwata/sd-bus-drop-version-2

sd-bus: drop version 2 format support
---

9db25d01efe2ae082c11f017b028d2c4ee7fa16d
diff --cc src/boot/efi/stub.c
index 36becafa083,afcc106b52d..f335d3782d5
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@@ -68,12 -68,12 +68,12 @@@ static EFI_STATUS combine_initrd
  
                  /* Order matters, the real initrd must come first, since it might include microcode updates
                   * which the kernel only looks for in the first cpio archive */
 -                CopyMem(p, PHYSICAL_ADDRESS_TO_POINTER(initrd_base), initrd_size);
 +                memcpy(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);
 +                        memset(p, 0, pad);
                          p += pad;
                  }
          }