2013-06-07 18:03:56 +00:00
|
|
|
From a446d9c14fa9e4a10a1ab8f50fa60b9530d8064f Mon Sep 17 00:00:00 2001
|
2013-05-02 20:54:52 +00:00
|
|
|
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
|
|
Date: Fri, 1 Mar 2013 10:39:41 +0100
|
2013-06-12 19:24:37 +00:00
|
|
|
Subject: [PATCH 174/482] * grub-core/loader/i386/pc/linux.c
|
2013-05-02 20:54:52 +00:00
|
|
|
(grub_cmd_linux): Fix compilation for 64-bit platforms.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
ChangeLog | 5 +++++
|
|
|
|
|
grub-core/loader/i386/pc/linux.c | 5 +++--
|
|
|
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
|
|
|
index ccd6c0a..3ca1fed 100644
|
|
|
|
|
--- a/ChangeLog
|
|
|
|
|
+++ b/ChangeLog
|
|
|
|
|
@@ -1,5 +1,10 @@
|
|
|
|
|
2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
|
|
|
|
|
|
+ * grub-core/loader/i386/pc/linux.c (grub_cmd_linux): Fix compilation
|
|
|
|
|
+ for 64-bit platforms.
|
|
|
|
|
+
|
|
|
|
|
+2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
|
+
|
|
|
|
|
* grub-core/disk/efi/efidisk.c: Transform iterate_child_devices into
|
|
|
|
|
a FOR_CHILDREN macro.
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
|
|
|
|
|
index 39206c8..3ce21bc 100644
|
|
|
|
|
--- a/grub-core/loader/i386/pc/linux.c
|
|
|
|
|
+++ b/grub-core/loader/i386/pc/linux.c
|
|
|
|
|
@@ -231,8 +231,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_dprintf ("linux", "[Linux-%s, setup=0x%x, size=0x%x]\n",
|
|
|
|
|
- grub_linux_is_bzimage ? "bzImage" : "zImage", real_size,
|
|
|
|
|
- grub_linux16_prot_size);
|
|
|
|
|
+ grub_linux_is_bzimage ? "bzImage" : "zImage",
|
|
|
|
|
+ (unsigned) real_size,
|
|
|
|
|
+ (unsigned) grub_linux16_prot_size);
|
|
|
|
|
|
|
|
|
|
relocator = grub_relocator_new ();
|
|
|
|
|
if (!relocator)
|
|
|
|
|
--
|
2013-06-07 18:03:56 +00:00
|
|
|
1.8.2.1
|
2013-05-02 20:54:52 +00:00
|
|
|
|
