mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-18 17:56:30 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
28 lines
981 B
Diff
28 lines
981 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Robert Elliott <elliott@hpe.com>
|
|
Date: Fri, 22 Jan 2016 13:32:30 +0100
|
|
Subject: [PATCH] efiemu: Handle persistent RAM and unknown possible future
|
|
additions.
|
|
|
|
(cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0)
|
|
|
|
Resolves: rhbz#1288608
|
|
---
|
|
grub-core/efiemu/mm.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
|
|
index 52a032f7b2e..92e7df7e501 100644
|
|
--- a/grub-core/efiemu/mm.c
|
|
+++ b/grub-core/efiemu/mm.c
|
|
@@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
|
|
return grub_efiemu_add_to_mmap (addr, size,
|
|
GRUB_EFI_ACPI_MEMORY_NVS);
|
|
|
|
- case GRUB_MEMORY_PERSISTENT:
|
|
- case GRUB_MEMORY_PERSISTENT_LEGACY:
|
|
+ case GRUB_MEMORY_PRAM:
|
|
+ case GRUB_MEMORY_PMEM:
|
|
return grub_efiemu_add_to_mmap (addr, size,
|
|
GRUB_EFI_PERSISTENT_MEMORY);
|
|
default:
|