dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0195-efiemu-Fix-compilation-failure.patch

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