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

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