vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/lib/efi/relocator.c (grub_relocator_firmware_alloc_region):

Browse source 
Remove dprintf.
	* grub-core/lib/relocator.c (malloc_in_range): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-20 13:39:04 +02:00
parent 90ec4b7f6c
commit 872dac835c
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-04-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/efi/relocator.c (grub_relocator_firmware_alloc_region):
Remove dprintf.
* grub-core/lib/relocator.c (malloc_in_range): Likewise.
2013-04-19 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/ieee1275/init.c (grub_claim_heap): Improve handling * grub-core/kern/ieee1275/init.c (grub_claim_heap): Improve handling

4
grub-core/lib/efi/relocator.c
View file

@ -96,10 +96,10 @@ grub_relocator_firmware_alloc_region (grub_addr_t start, grub_size_t size)
if (grub_efi_is_finished) if (grub_efi_is_finished)
return 1; return 1;
#ifdef DEBUG_RELOCATOR_NOMEM_DPRINTF
grub_dprintf ("relocator", "EFI alloc: %llx, %llx\n", grub_dprintf ("relocator", "EFI alloc: %llx, %llx\n",
(unsigned long long) start, (unsigned long long) size); (unsigned long long) start, (unsigned long long) size);
#endif
b = grub_efi_system_table->boot_services; b = grub_efi_system_table->boot_services;
status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ADDRESS, status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ADDRESS,
GRUB_EFI_LOADER_DATA, size >> 12, &address); GRUB_EFI_LOADER_DATA, size >> 12, &address);

2
grub-core/lib/relocator.c
View file

@ -984,9 +984,11 @@ malloc_in_range (struct grub_relocator *rel,
alloc_end = min (events[j].pos, target + size); alloc_end = min (events[j].pos, target + size);
if (alloc_end > alloc_start) if (alloc_end > alloc_start)
{ {
#ifdef DEBUG_RELOCATOR_NOMEM_DPRINTF
grub_dprintf ("relocator", "subchunk 0x%lx-0x%lx, %d\n", grub_dprintf ("relocator", "subchunk 0x%lx-0x%lx, %d\n",
(unsigned long) alloc_start, (unsigned long) alloc_start,
(unsigned long) alloc_end, typepre); (unsigned long) alloc_end, typepre);
#endif
curschu->type = typepre; curschu->type = typepre;
curschu->start = alloc_start; curschu->start = alloc_start;
curschu->size = alloc_end - alloc_start; curschu->size = alloc_end - alloc_start;