Blame grub-2.00-dont-decrease-mmap-size.patch
|
|
2c47e4d |
From: Stuart Hayes <stuart_hayes@dell.com>
|
|
|
5d4d477 |
Subject: Don't decrease efi memory map size
|
|
|
5d4d477 |
Date: 2012-07-02 09:14:37 +0000
|
|
|
5d4d477 |
|
|
|
5d4d477 |
|
|
|
5d4d477 |
|
|
|
5d4d477 |
--- a/grub-core/loader/i386/linux.c 2012-06-27 20:55:09 +0000
|
|
|
5d4d477 |
+++ b/grub-core/loader/i386/linux.c 2012-07-02 09:14:37 +0000
|
|
|
5d4d477 |
@@ -118,12 +118,13 @@
|
|
|
5d4d477 |
int ret;
|
|
|
5d4d477 |
grub_efi_memory_descriptor_t *mmap;
|
|
|
5d4d477 |
grub_efi_uintn_t desc_size;
|
|
|
5d4d477 |
+ grub_efi_uintn_t cur_mmap_size = mmap_size;
|
|
|
5d4d477 |
|
|
|
5d4d477 |
- mmap = grub_malloc (mmap_size);
|
|
|
5d4d477 |
+ mmap = grub_malloc (cur_mmap_size);
|
|
|
5d4d477 |
if (! mmap)
|
|
|
5d4d477 |
return 0;
|
|
|
5d4d477 |
|
|
|
5d4d477 |
- ret = grub_efi_get_memory_map (&mmap_size, mmap, 0, &desc_size, 0);
|
|
|
5d4d477 |
+ ret = grub_efi_get_memory_map (&cur_mmap_size, mmap, 0, &desc_size, 0);
|
|
|
5d4d477 |
grub_free (mmap);
|
|
|
5d4d477 |
|
|
|
5d4d477 |
if (ret < 0)
|
|
|
5d4d477 |
@@ -134,6 +135,8 @@
|
|
|
5d4d477 |
else if (ret > 0)
|
|
|
5d4d477 |
break;
|
|
|
5d4d477 |
|
|
|
5d4d477 |
+ if (mmap_size < cur_mmap_size)
|
|
|
5d4d477 |
+ mmap_size = cur_mmap_size;
|
|
|
5d4d477 |
mmap_size += (1 << 12);
|
|
|
5d4d477 |
}
|
|
|
5d4d477 |
|
|
|
5d4d477 |
|