81 lines
2.7 KiB
Diff
81 lines
2.7 KiB
Diff
From 8776e5a942582adaadc67865ed74cdd199e56a16 Mon Sep 17 00:00:00 2001
|
|
From: Leif Lindholm <leif.lindholm@linaro.org>
|
|
Date: Thu, 1 Feb 2018 18:18:50 +0000
|
|
Subject: [PATCH] Make arch-specific linux.h include guards architecture unique
|
|
|
|
Replace uses of GRUB_LINUX_MACHINE_HEADER and GRUB_LINUX_CPU_HEADER
|
|
with GRUB_<arch>_LINUX_HEADER include guards to prevent issues when
|
|
including more than one of them.
|
|
|
|
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
include/grub/arm/linux.h | 6 +++---
|
|
include/grub/arm64/linux.h | 6 +++---
|
|
include/grub/i386/linux.h | 6 +++---
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
|
|
index f217f8281ad..3706c46c66f 100644
|
|
--- a/include/grub/arm/linux.h
|
|
+++ b/include/grub/arm/linux.h
|
|
@@ -17,8 +17,8 @@
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
-#ifndef GRUB_LINUX_CPU_HEADER
|
|
-#define GRUB_LINUX_CPU_HEADER 1
|
|
+#ifndef GRUB_ARM_LINUX_HEADER
|
|
+#define GRUB_ARM_LINUX_HEADER 1
|
|
|
|
#define LINUX_ZIMAGE_OFFSET 0x24
|
|
#define LINUX_ZIMAGE_MAGIC 0x016f2818
|
|
@@ -66,4 +66,4 @@ grub_arm_firmware_get_machine_type (void)
|
|
|
|
#define FDT_ADDITIONAL_ENTRIES_SIZE 0x300
|
|
|
|
-#endif /* ! GRUB_LINUX_CPU_HEADER */
|
|
+#endif /* ! GRUB_ARM_LINUX_HEADER */
|
|
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
|
|
index a981df5d15f..a8edf50dc2c 100644
|
|
--- a/include/grub/arm64/linux.h
|
|
+++ b/include/grub/arm64/linux.h
|
|
@@ -16,8 +16,8 @@
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
-#ifndef GRUB_LINUX_CPU_HEADER
|
|
-#define GRUB_LINUX_CPU_HEADER 1
|
|
+#ifndef GRUB_ARM64_LINUX_HEADER
|
|
+#define GRUB_ARM64_LINUX_HEADER 1
|
|
|
|
#include <grub/efi/efi.h>
|
|
|
|
@@ -43,4 +43,4 @@ grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header
|
|
grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size,
|
|
char *args);
|
|
|
|
-#endif /* ! GRUB_LINUX_CPU_HEADER */
|
|
+#endif /* ! GRUB_ARM64_LINUX_HEADER */
|
|
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
|
|
index da0ca3b83cd..2ff1621a429 100644
|
|
--- a/include/grub/i386/linux.h
|
|
+++ b/include/grub/i386/linux.h
|
|
@@ -16,8 +16,8 @@
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
-#ifndef GRUB_LINUX_MACHINE_HEADER
|
|
-#define GRUB_LINUX_MACHINE_HEADER 1
|
|
+#ifndef GRUB_I386_LINUX_HEADER
|
|
+#define GRUB_I386_LINUX_HEADER 1
|
|
|
|
#define GRUB_LINUX_MAGIC_SIGNATURE 0x53726448 /* "HdrS" */
|
|
#define GRUB_LINUX_DEFAULT_SETUP_SECTS 4
|
|
@@ -312,4 +312,4 @@ struct linux_kernel_params
|
|
} GRUB_PACKED;
|
|
#endif /* ! ASM_FILE */
|
|
|
|
-#endif /* ! GRUB_LINUX_MACHINE_HEADER */
|
|
+#endif /* ! GRUB_I386_LINUX_HEADER */
|