[grub/f17] Fix build error
Peter Jones
pjones at fedoraproject.org
Tue Mar 27 18:11:28 UTC 2012
commit 25ebaa6f854bea76adc53297b86676170e6d8abd
Author: Peter Jones <pjones at redhat.com>
Date: Tue Mar 27 14:11:14 2012 -0400
Fix build error
grub-fedora-17.patch | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/grub-fedora-17.patch b/grub-fedora-17.patch
index b152b08..00c55a7 100644
--- a/grub-fedora-17.patch
+++ b/grub-fedora-17.patch
@@ -1,5 +1,5 @@
From: Peter Jones <pjones at redhat.com>"
-Date: Tue Mar 27 13:31:14 EDT 2012
+Date: Tue Mar 27 14:11:00 EDT 2012
Subject: [PATCH] Changes from grub-0.97 to fedora-17
This patch is a bundle of the changes between grub-0.97 and fedora-17.
@@ -29625,7 +29625,7 @@ index 0000000..4cff104
+
diff --git a/efi/x86_64/loader/linux.c b/efi/x86_64/loader/linux.c
new file mode 100644
-index 0000000..f466530
+index 0000000..d3f07da
--- /dev/null
+++ b/efi/x86_64/loader/linux.c
@@ -0,0 +1,663 @@
@@ -30116,7 +30116,7 @@ index 0000000..f466530
+ kernel_pages = (kernel_length + 4095) >> 12;
+
+ /* Attempt to allocate address space for the kernel */
-+ kernel_base = grub_efi_allocate_pages(kernel_base, kernel_pages);
++ kernel_base = (grub_uint64_t)grub_efi_allocate_pages(kernel_base, kernel_pages);
+
+ if (!kernel_base && relocatable) {
+ grub_efi_memory_descriptor_t *desc;
@@ -30145,7 +30145,7 @@ index 0000000..f466530
+ (tdesc.physical_start + (tdesc.num_pages << 12)))
+ continue;
+
-+ kernel_base = grub_efi_allocate_pages(addr, kernel_pages);
++ kernel_base = (grub_uint64_t)grub_efi_allocate_pages(addr, kernel_pages);
+
+ if (kernel_base) {
+ lh->kernel_alignment = 1 << align;
More information about the scm-commits
mailing list