2004-10-11 Hollis Blanchard <hollis@penguinppc.org>

    * boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_claim):
    Return -1 if args.base was -1.

diff --git a/ChangeLog b/ChangeLog
index 3ae1a45ebf88a61eba443be599bc623c9914ae60..87c68875210c6f7f47d2779f06fac4e9accb2246 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11  Hollis Blanchard  <hollis@penguinppc.org>
+
+    * boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_claim):
+    Return -1 if args.base was -1.
+
 2004-10-08  Hollis Blanchard  <hollis@penguinppc.org>
 
        * term/powerpc/ieee1275/ieee1275.c (grub_ofconsole_cls): Use an ANSI

diff --git a/boot/powerpc/ieee1275/ieee1275.c b/boot/powerpc/ieee1275/ieee1275.c
index 96bd9014dac30616fa6dc6ad46ca3778ac819b23..93bdfcfacbb5c9e7c41c712de98ba59046b73305 100644 (file)
--- a/boot/powerpc/ieee1275/ieee1275.c
+++ b/boot/powerpc/ieee1275/ieee1275.c
@@ -420,6 +420,9 @@ grub_ieee1275_claim (grub_addr_t addr, grub_size_t size, unsigned int align,
   if (result)
     *result = args.base;
 
+  if (args.base == (grub_addr_t)-1)
+    return -1;
+
   return 0;
 }