|
 |
a5bd9f6 |
From 341b25a836be3f65230eb4077a202c66e9160b29 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Sat, 20 Apr 2013 13:39:04 +0200
|
|
|
a5bd9f6 |
Subject: [PATCH 329/364] * grub-core/lib/efi/relocator.c
|
|
|
a5bd9f6 |
(grub_relocator_firmware_alloc_region): Remove dprintf. *
|
|
|
a5bd9f6 |
grub-core/lib/relocator.c (malloc_in_range): Likewise.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 6 ++++++
|
|
|
a5bd9f6 |
grub-core/lib/efi/relocator.c | 4 ++--
|
|
|
a5bd9f6 |
grub-core/lib/relocator.c | 2 ++
|
|
|
a5bd9f6 |
3 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 3e606cb..6ca70a6 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,9 @@
|
|
|
a5bd9f6 |
+2013-04-20 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * grub-core/lib/efi/relocator.c (grub_relocator_firmware_alloc_region):
|
|
|
a5bd9f6 |
+ Remove dprintf.
|
|
|
a5bd9f6 |
+ * grub-core/lib/relocator.c (malloc_in_range): Likewise.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2013-04-19 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* grub-core/kern/ieee1275/init.c (grub_claim_heap): Improve handling
|
|
|
a5bd9f6 |
diff --git a/grub-core/lib/efi/relocator.c b/grub-core/lib/efi/relocator.c
|
|
|
a5bd9f6 |
index 0d346be..319b69e 100644
|
|
|
a5bd9f6 |
--- a/grub-core/lib/efi/relocator.c
|
|
|
a5bd9f6 |
+++ b/grub-core/lib/efi/relocator.c
|
|
|
a5bd9f6 |
@@ -96,10 +96,10 @@ grub_relocator_firmware_alloc_region (grub_addr_t start, grub_size_t size)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
if (grub_efi_is_finished)
|
|
|
a5bd9f6 |
return 1;
|
|
|
a5bd9f6 |
-
|
|
|
a5bd9f6 |
+#ifdef DEBUG_RELOCATOR_NOMEM_DPRINTF
|
|
|
a5bd9f6 |
grub_dprintf ("relocator", "EFI alloc: %llx, %llx\n",
|
|
|
a5bd9f6 |
(unsigned long long) start, (unsigned long long) size);
|
|
|
a5bd9f6 |
-
|
|
|
a5bd9f6 |
+#endif
|
|
|
a5bd9f6 |
b = grub_efi_system_table->boot_services;
|
|
|
a5bd9f6 |
status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ADDRESS,
|
|
|
a5bd9f6 |
GRUB_EFI_LOADER_DATA, size >> 12, &address);
|
|
|
a5bd9f6 |
diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
|
|
|
a5bd9f6 |
index 350066d..e085514 100644
|
|
|
a5bd9f6 |
--- a/grub-core/lib/relocator.c
|
|
|
a5bd9f6 |
+++ b/grub-core/lib/relocator.c
|
|
|
a5bd9f6 |
@@ -984,9 +984,11 @@ malloc_in_range (struct grub_relocator *rel,
|
|
|
a5bd9f6 |
alloc_end = min (events[j].pos, target + size);
|
|
|
a5bd9f6 |
if (alloc_end > alloc_start)
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
+#ifdef DEBUG_RELOCATOR_NOMEM_DPRINTF
|
|
|
a5bd9f6 |
grub_dprintf ("relocator", "subchunk 0x%lx-0x%lx, %d\n",
|
|
|
a5bd9f6 |
(unsigned long) alloc_start,
|
|
|
a5bd9f6 |
(unsigned long) alloc_end, typepre);
|
|
|
a5bd9f6 |
+#endif
|
|
|
a5bd9f6 |
curschu->type = typepre;
|
|
|
a5bd9f6 |
curschu->start = alloc_start;
|
|
|
a5bd9f6 |
curschu->size = alloc_end - alloc_start;
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|