diff -u grub-0.97/debian/changelog grub-0.97/debian/changelog
--- grub-0.97/debian/changelog
+++ grub-0.97/debian/changelog
@@ -1,3 +1,9 @@
+grub (0.97-20ubuntu7) gutsy; urgency=low
+
+  * Add patch from Mandriva grub-0.95-mem_lower.patch (Ubuntu bug #106887)
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Sat, 26 May 2007 11:15:23 +0200
+
 grub (0.97-20ubuntu6) feisty; urgency=low
 
   * Migrate root=/dev/evms/[hs]d[a-z][0-9]* to UUIDs, since systems upgraded
diff -u grub-0.97/debian/patches/00list grub-0.97/debian/patches/00list
--- grub-0.97/debian/patches/00list
+++ grub-0.97/debian/patches/00list
@@ -29,0 +30,3 @@
+
+# Fix from Mandriva (ubuntu bug#106887)
+grub-0.95-mem_lower.patch
only in patch2:
unchanged:
--- grub-0.97.orig/debian/patches/grub-0.95-mem_lower.patch
+++ grub-0.97/debian/patches/grub-0.95-mem_lower.patch
@@ -0,0 +1,79 @@
+diff -Naur grub-0.95.orig/stage2/common.c grub-0.95/stage2/common.c
+--- grub-0.95.orig/stage2/common.c	2004-03-27 13:25:44.000000000 -0300
++++ grub-0.95/stage2/common.c	2004-12-08 17:36:36.590781312 -0200
+@@ -108,26 +108,43 @@
+   unsigned long long top;
+   unsigned long addr;
+   int cont;
+-  
++
+   top = bottom;
+-  do
+-    {
+-      for (cont = 0, addr = mbi.mmap_addr;
+-	   addr < mbi.mmap_addr + mbi.mmap_length;
+-	   addr += *((unsigned long *) addr) + 4)
++    /* If detecting mbi.mem_lower */
++    if (bottom == 0) {
++	/* Initialize to 640Kb */
++	top = 0xA0000ULL;
++	for (addr = mbi.mmap_addr;
++	     addr < mbi.mmap_addr + mbi.mmap_length;
++	     addr += *((unsigned long *) addr) + 4) {
++	    struct AddrRangeDesc *desc = (struct AddrRangeDesc *) addr;
++
++	    /* If there is anything reserved below 640Kb */
++	    if (desc->BaseAddr < top && desc->Length &&
++		desc->Type != MB_ARD_MEMORY)
++		top = desc->BaseAddr;
++	}
++    }
++    else {
++      do
+ 	{
+-	  struct AddrRangeDesc *desc = (struct AddrRangeDesc *) addr;
+-	  
+-	  if (desc->Type == MB_ARD_MEMORY
+-	      && desc->BaseAddr <= top
+-	      && desc->BaseAddr + desc->Length > top)
++	  for (cont = 0, addr = mbi.mmap_addr;
++	       addr < mbi.mmap_addr + mbi.mmap_length;
++	       addr += *((unsigned long *) addr) + 4)
+ 	    {
+-	      top = desc->BaseAddr + desc->Length;
+-	      cont++;
++	      struct AddrRangeDesc *desc = (struct AddrRangeDesc *) addr;
++	  
++	      if (desc->Type == MB_ARD_MEMORY
++		  && desc->BaseAddr <= top
++		  && desc->BaseAddr + desc->Length > top)
++		{
++		  top = desc->BaseAddr + desc->Length;
++		  cont++;
++		}
+ 	    }
+ 	}
++      while (cont);
+     }
+-  while (cont);
+ 
+   /* For now, GRUB assumes 32bits addresses, so...  */
+   if (top > 0xFFFFFFFF)
+@@ -194,6 +211,7 @@
+   if (mbi.mmap_length)
+     {
+       unsigned long long max_addr;
++      unsigned long mem_lower = mmap_avail_at (0) >> 10;
+       
+       /*
+        *  This is to get the lower memory, and upper memory (up to the
+@@ -201,7 +219,8 @@
+        *  elements.  This is for OS's that don't care about the memory
+        *  map, but might care about total RAM available.
+        */
+-      mbi.mem_lower = mmap_avail_at (0) >> 10;
++      if (mem_lower < mbi.mem_lower)
++	mbi.mem_lower = mem_lower;
+       mbi.mem_upper = mmap_avail_at (0x100000) >> 10;
+ 
+       /* Find the maximum available address. Ignore any memory holes.  */