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

	is larger than address_cells, use that value for address_cells too.

diff --git a/ChangeLog b/ChangeLog
index ca0ab43ed2cf21c9b642b764c47231e9c0619492..631118fc59d9eadce54128b4045bb535bf38acc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-22  David S. Miller  <davem@davemloft.net>
+
+       * 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 <phcoder@gmail.com>
 
        Correct GPT definition

diff --git a/kern/ieee1275/mmap.c b/kern/ieee1275/mmap.c
index 5b30dbb9ea0a3f2db0124a4c9c427ca32f19af61..317a1211762ea281bfe85b54b6ed131b0c801648 100644 (file)
--- a/kern/ieee1275/mmap.c
+++ b/kern/ieee1275/mmap.c
@@ -38,6 +38,9 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
   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,