|
 |
752ceb1 |
From 7d36709d5e769eb49b41cca709bd64336b47ab4f Mon Sep 17 00:00:00 2001
|
|
|
752ceb1 |
From: Leif Lindholm <leif.lindholm@linaro.org>
|
|
|
752ceb1 |
Date: Thu, 1 Feb 2018 18:18:52 +0000
|
|
|
752ceb1 |
Subject: [PATCH] i386: make struct linux_kernel_header architecture specific
|
|
|
752ceb1 |
|
|
|
752ceb1 |
struct linux_kernel_header -> struct linux_i386_kernel_header
|
|
|
752ceb1 |
|
|
|
752ceb1 |
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
|
752ceb1 |
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
752ceb1 |
---
|
|
|
752ceb1 |
grub-core/commands/file.c | 2 +-
|
|
|
752ceb1 |
grub-core/loader/i386/linux.c | 2 +-
|
|
|
752ceb1 |
grub-core/loader/i386/pc/linux.c | 6 +++---
|
|
|
752ceb1 |
grub-core/loader/i386/xen_file.c | 2 +-
|
|
|
752ceb1 |
include/grub/i386/linux.h | 2 +-
|
|
|
752ceb1 |
5 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
752ceb1 |
|
|
|
752ceb1 |
diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c
|
|
|
752ceb1 |
index 474666d3a98..63c84499bab 100644
|
|
|
752ceb1 |
--- a/grub-core/commands/file.c
|
|
|
752ceb1 |
+++ b/grub-core/commands/file.c
|
|
|
752ceb1 |
@@ -497,7 +497,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
|
752ceb1 |
case IS_X86_LINUX32:
|
|
|
752ceb1 |
case IS_X86_LINUX:
|
|
|
752ceb1 |
{
|
|
|
752ceb1 |
- struct linux_kernel_header lh;
|
|
|
752ceb1 |
+ struct linux_i386_kernel_header lh;
|
|
|
752ceb1 |
if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
|
|
|
752ceb1 |
break;
|
|
|
752ceb1 |
if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
|
|
|
752ceb1 |
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
|
|
752ceb1 |
index 9bd5afb6561..44301e12659 100644
|
|
|
752ceb1 |
--- a/grub-core/loader/i386/linux.c
|
|
|
752ceb1 |
+++ b/grub-core/loader/i386/linux.c
|
|
|
752ceb1 |
@@ -678,7 +678,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
752ceb1 |
int argc, char *argv[])
|
|
|
752ceb1 |
{
|
|
|
752ceb1 |
grub_file_t file = 0;
|
|
|
752ceb1 |
- struct linux_kernel_header lh;
|
|
|
752ceb1 |
+ struct linux_i386_kernel_header lh;
|
|
|
752ceb1 |
grub_uint8_t setup_sects;
|
|
|
752ceb1 |
grub_size_t real_size, prot_size, prot_file_size;
|
|
|
752ceb1 |
grub_ssize_t len;
|
|
|
752ceb1 |
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
|
|
|
752ceb1 |
index 31a68764465..b69cb7a3a7f 100644
|
|
|
752ceb1 |
--- a/grub-core/loader/i386/pc/linux.c
|
|
|
752ceb1 |
+++ b/grub-core/loader/i386/pc/linux.c
|
|
|
752ceb1 |
@@ -121,7 +121,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
752ceb1 |
int argc, char *argv[])
|
|
|
752ceb1 |
{
|
|
|
752ceb1 |
grub_file_t file = 0;
|
|
|
752ceb1 |
- struct linux_kernel_header lh;
|
|
|
752ceb1 |
+ struct linux_i386_kernel_header lh;
|
|
|
752ceb1 |
grub_uint8_t setup_sects;
|
|
|
752ceb1 |
grub_size_t real_size;
|
|
|
752ceb1 |
grub_ssize_t len;
|
|
|
752ceb1 |
@@ -387,7 +387,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
752ceb1 |
{
|
|
|
752ceb1 |
grub_size_t size = 0;
|
|
|
752ceb1 |
grub_addr_t addr_max, addr_min;
|
|
|
752ceb1 |
- struct linux_kernel_header *lh;
|
|
|
752ceb1 |
+ struct linux_i386_kernel_header *lh;
|
|
|
752ceb1 |
grub_uint8_t *initrd_chunk;
|
|
|
752ceb1 |
grub_addr_t initrd_addr;
|
|
|
752ceb1 |
grub_err_t err;
|
|
|
752ceb1 |
@@ -405,7 +405,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
752ceb1 |
goto fail;
|
|
|
752ceb1 |
}
|
|
|
752ceb1 |
|
|
|
752ceb1 |
- lh = (struct linux_kernel_header *) grub_linux_real_chunk;
|
|
|
752ceb1 |
+ lh = (struct linux_i386_kernel_header *) grub_linux_real_chunk;
|
|
|
752ceb1 |
|
|
|
752ceb1 |
if (!(lh->header == grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
|
|
|
752ceb1 |
&& grub_le_to_cpu16 (lh->version) >= 0x0200))
|
|
|
752ceb1 |
diff --git a/grub-core/loader/i386/xen_file.c b/grub-core/loader/i386/xen_file.c
|
|
|
752ceb1 |
index 6e76e16aa11..77a93e7b228 100644
|
|
|
752ceb1 |
--- a/grub-core/loader/i386/xen_file.c
|
|
|
752ceb1 |
+++ b/grub-core/loader/i386/xen_file.c
|
|
|
752ceb1 |
@@ -26,7 +26,7 @@ grub_elf_t
|
|
|
752ceb1 |
grub_xen_file (grub_file_t file)
|
|
|
752ceb1 |
{
|
|
|
752ceb1 |
grub_elf_t elf;
|
|
|
752ceb1 |
- struct linux_kernel_header lh;
|
|
|
752ceb1 |
+ struct linux_i386_kernel_header lh;
|
|
|
752ceb1 |
grub_file_t off_file;
|
|
|
752ceb1 |
grub_uint32_t payload_offset, payload_length;
|
|
|
752ceb1 |
grub_uint8_t magic[6];
|
|
|
752ceb1 |
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
|
|
|
752ceb1 |
index 3ff432be9ad..0bd75881708 100644
|
|
|
752ceb1 |
--- a/include/grub/i386/linux.h
|
|
|
752ceb1 |
+++ b/include/grub/i386/linux.h
|
|
|
752ceb1 |
@@ -85,7 +85,7 @@ enum
|
|
|
752ceb1 |
};
|
|
|
752ceb1 |
|
|
|
752ceb1 |
/* For the Linux/i386 boot protocol version 2.10. */
|
|
|
752ceb1 |
-struct linux_kernel_header
|
|
|
752ceb1 |
+struct linux_i386_kernel_header
|
|
|
752ceb1 |
{
|
|
|
752ceb1 |
grub_uint8_t code1[0x0020];
|
|
|
752ceb1 |
grub_uint16_t cl_magic; /* Magic number 0xA33F */
|