[2131] * kern/ieee1275/mmap.c (grub_machine_mmap_iterate): If size_cells

[David S. Miller]

Revision: 2131
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2131
Author:   davem
Date:     2009-04-22 09:45:43 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
        * kern/ieee1275/mmap.c (grub_machine_mmap_iterate): If size_cells
        is larger than address_cells, use that value for address_cells too.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/ieee1275/mmap.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-04-19 20:38:46 UTC (rev 2130)
+++ trunk/grub2/ChangeLog       2009-04-22 09:45:43 UTC (rev 2131)
@@ -1,3 +1,8 @@
+2009-04-22  David S. Miller  <address@hidden>
+
+       * kern/ieee1275/mmap.c (grub_machine_mmap_iterate): If size_cells
+       is larger than address_cells, use that value for address_cells too.
+
 2009-04-19  Vladimir Serbinenko <address@hidden>
 
        Correct GPT definition

Modified: trunk/grub2/kern/ieee1275/mmap.c
===================================================================
--- trunk/grub2/kern/ieee1275/mmap.c    2009-04-19 20:38:46 UTC (rev 2130)
+++ trunk/grub2/kern/ieee1275/mmap.c    2009-04-22 09:45:43 UTC (rev 2131)
@@ -38,6 +38,9 @@
   grub_ieee1275_get_integer_property (root, "#size-cells", &size_cells,
                                      sizeof size_cells, 0);
 
+  if (size_cells > address_cells)
+    address_cells = size_cells;
+
   /* Load `/memory/available'.  */
   if (grub_ieee1275_finddevice ("/memory", &memory))
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE,