fa8b2484d0
- Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
32 lines
997 B
Diff
32 lines
997 B
Diff
From cd5e17c01c996bcf446e16978e37569aa0d889dd Mon Sep 17 00:00:00 2001
|
|
From: Robert Elliott <elliott@hpe.com>
|
|
Date: Fri, 22 Jan 2016 13:32:30 +0100
|
|
Subject: [PATCH 141/198] 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 52a032f7b..92e7df7e5 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:
|
|
--
|
|
2.14.3
|
|
|