Blame SOURCES/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch

a85e8e
From 623002084c7550214ae9740547a557ffb31c3658 Mon Sep 17 00:00:00 2001
a85e8e
From: Vladimir Serbinenko <phcoder@gmail.com>
a85e8e
Date: Fri, 28 Feb 2014 09:50:47 +0100
a85e8e
Subject: [PATCH 063/260] * grub-core/mmap/i386/uppermem.c (lower_hook)
a85e8e
 [COREBOOT]: Ignore low tables for low memory calculations.
a85e8e
a85e8e
---
a85e8e
 ChangeLog                      | 5 +++++
a85e8e
 grub-core/mmap/i386/uppermem.c | 6 +++++-
a85e8e
 2 files changed, 10 insertions(+), 1 deletion(-)
a85e8e
a85e8e
diff --git a/ChangeLog b/ChangeLog
a85e8e
index bbaed2691..6ed6cf4ec 100644
a85e8e
--- a/ChangeLog
a85e8e
+++ b/ChangeLog
a85e8e
@@ -1,5 +1,10 @@
a85e8e
 2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
a85e8e
 
a85e8e
+	* grub-core/mmap/i386/uppermem.c (lower_hook) [COREBOOT]: Ignore low
a85e8e
+	tables for low memory calculations.
a85e8e
+
a85e8e
+2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
a85e8e
+
a85e8e
 	* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi): Limit
a85e8e
 	location to 640K.
a85e8e
 
a85e8e
diff --git a/grub-core/mmap/i386/uppermem.c b/grub-core/mmap/i386/uppermem.c
a85e8e
index bd8b429c4..a6be9896d 100644
a85e8e
--- a/grub-core/mmap/i386/uppermem.c
a85e8e
+++ b/grub-core/mmap/i386/uppermem.c
a85e8e
@@ -31,8 +31,12 @@ lower_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
a85e8e
 
a85e8e
   if (type != GRUB_MEMORY_AVAILABLE)
a85e8e
     return 0;
a85e8e
+#ifdef GRUB_MACHINE_COREBOOT
a85e8e
+  if (addr <= 0x1000)
a85e8e
+#else
a85e8e
   if (addr == 0)
a85e8e
-    *lower = size;
a85e8e
+#endif
a85e8e
+    *lower = size + addr;
a85e8e
   return 0;
a85e8e
 }
a85e8e
 
a85e8e
-- 
a85e8e
2.13.0
a85e8e