From f01005a8327daaed74509d411d62d77945f675e4 Mon Sep 17 00:00:00 2001 From: davem Date: Wed, 22 Apr 2009 09:45:43 +0000 Subject: [PATCH] * kern/ieee1275/mmap.c (grub_machine_mmap_iterate): If size_cells is larger than address_cells, use that value for address_cells too. --- ChangeLog | 5 +++++ kern/ieee1275/mmap.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index ca0ab43ed..631118fc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-22 David S. Miller + + * 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 Correct GPT definition diff --git a/kern/ieee1275/mmap.c b/kern/ieee1275/mmap.c index 5b30dbb9e..317a12117 100644 --- 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,