[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/10] arm64: align linux kernel magic macro naming with i386
From: |
Leif Lindholm |
Subject: |
[PATCH 06/10] arm64: align linux kernel magic macro naming with i386 |
Date: |
Thu, 1 Feb 2018 18:18:54 +0000 |
Change GRUB_ARM64_LINUX_MAGIC to GRUB_LINUX_ARM64_MAGIC_SIGNATURE.
Signed-off-by: Leif Lindholm <address@hidden>
---
grub-core/loader/arm64/linux.c | 2 +-
include/grub/arm64/linux.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 <grub/efi/efi.h>
-#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
--
2.11.0
- [PATCH 01/10] arm64/efi: move EFI_PAGE definitions to efi/memory.h, (continued)
- [PATCH 06/10] arm64: align linux kernel magic macro naming with i386,
Leif Lindholm <=
- [PATCH 07/10] arm: switch linux loader to linux_arm_kernel_header struct, Leif Lindholm, 2018/02/01
- [PATCH 10/10] commands/file: use definitions from arm64/linux.h, Leif Lindholm, 2018/02/01
- [PATCH 05/10] arm64: align linux kernel header struct naming with i386, Leif Lindholm, 2018/02/01
- [PATCH 09/10] commands/file: use definitions from arm/linux.h, Leif Lindholm, 2018/02/01