From: Leif Lindholm Date: Thu, 1 Feb 2018 18:18:54 +0000 (+0000) Subject: arm64: align linux kernel magic macro naming with i386 X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=grub.git;a=commitdiff_plain;h=7fd9722d0c5e9c5a85b782ef435c80085da308b2 arm64: align linux kernel magic macro naming with i386 Change GRUB_ARM64_LINUX_MAGIC to GRUB_LINUX_ARM64_MAGIC_SIGNATURE. Signed-off-by: Leif Lindholm Reviewed-by: Daniel Kiper --- diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 79f25a711..ebe1e730d 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -50,7 +50,7 @@ static grub_addr_t initrd_end; grub_err_t grub_arm64_uefi_check_image (struct linux_arm64_kernel_header * lh) { - if (lh->magic != GRUB_ARM64_LINUX_MAGIC) + if (lh->magic != GRUB_LINUX_ARM64_MAGIC_SIGNATURE) return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC) diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index abe7e9cc3..b06347624 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -21,7 +21,7 @@ #include -#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ +#define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */ /* From linux/Documentation/arm64/booting.txt */ struct linux_arm64_kernel_header