|
 |
6b3c76 |
From bbe2526e1df870813b8e787cb2528c24f28907c1 Mon Sep 17 00:00:00 2001
|
|
|
a85e8e |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a85e8e |
Date: Fri, 22 Jan 2016 14:10:30 +0100
|
|
|
6b3c76 |
Subject: [PATCH 195/261] efiemu: Fix compilation failure
|
|
|
a85e8e |
|
|
|
a85e8e |
(cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62)
|
|
|
a85e8e |
|
|
|
a85e8e |
Resolves: rhbz#1288608
|
|
|
a85e8e |
---
|
|
|
a85e8e |
grub-core/efiemu/mm.c | 6 +++---
|
|
|
a85e8e |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
a85e8e |
|
|
|
a85e8e |
diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
|
|
|
6b3c76 |
index 13af4ad0d..e606dbffc 100644
|
|
|
a85e8e |
--- a/grub-core/efiemu/mm.c
|
|
|
a85e8e |
+++ b/grub-core/efiemu/mm.c
|
|
|
a85e8e |
@@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
|
|
|
a85e8e |
return grub_efiemu_add_to_mmap (addr, size,
|
|
|
a85e8e |
GRUB_EFI_ACPI_MEMORY_NVS);
|
|
|
a85e8e |
|
|
|
a85e8e |
- case GRUB_MEMORY_PRAM:
|
|
|
a85e8e |
- case GRUB_MEMORY_PMEM:
|
|
|
a85e8e |
+ case GRUB_MEMORY_PERSISTENT:
|
|
|
a85e8e |
+ case GRUB_MEMORY_PERSISTENT_LEGACY:
|
|
|
a85e8e |
return grub_efiemu_add_to_mmap (addr, size,
|
|
|
a85e8e |
GRUB_EFI_PERSISTENT_MEMORY);
|
|
|
a85e8e |
default:
|
|
|
a85e8e |
@@ -483,7 +483,7 @@ grub_efiemu_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
|
|
|
a85e8e |
|
|
|
a85e8e |
case GRUB_EFI_PERSISTENT_MEMORY:
|
|
|
a85e8e |
hook (efiemu_mmap[i].physical_start, efiemu_mmap[i].num_pages * 4096,
|
|
|
a85e8e |
- GRUB_MEMORY_PMEM, hook_data);
|
|
|
a85e8e |
+ GRUB_MEMORY_PERSISTENT, hook_data);
|
|
|
a85e8e |
break;
|
|
|
a85e8e |
|
|
|
a85e8e |
}
|
|
|
6b3c76 |
--
|
|
|
6b3c76 |
2.13.5
|
|
|
6b3c76 |
|