another regression on Efika

[Robert Millan]

Hi,

I spotted another regression, caused by the following commits:

2007-02-21  Hollis Blanchard  <address@hidden>

        * kern/powerpc/ieee1275/init.c (HEAP_SIZE): Removed.
        (HEAP_LIMIT): New macro.
        (grub_claim_heap): Claim memory up to `heaplimit'.

2007-02-21  Hollis Blanchard  <address@hidden>

        * conf/powerpc-ieee1275.rmk (kernel_elf_LDFLAGS): Link at 64KB.
        * kern/powerpc/ieee1275/init.c (_end): Add declaration.
        (_start): Likewise.
        (grub_arch_modules_addr): Return address after `_end'.
        * util/powerpc/ieee1275/grub-mkimage.c: Include grub/misc.h.
        (load_modules): Use new parameter as `p_paddr' and `p_vaddr'.
        (add_segments): Calculate `_end' from phdr size and location.
        (ALIGN_UP): Moved to ...
        * include/grub/misc.h: here.
        * include/grub/powerpc/ieee1275/kernel.h (GRUB_IEEE1275_MOD_ALIGN):
        New macro.
        (GRUB_IEEE1275_MODULE_BASE): Removed.

They move GRUB from being able to initialise and fire up the menu (although
still unable to access disks), to abort with:

  kern/mm.c:  grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");

Unfortunately my limited expertise doesn't let me figure out what these changes
are doing.  I'm attaching a reverse diff of the commit, such that when applied
to HEAD makes GRUB work again (verified) [1].  Perhaps someone can make sense
of it.

[1] Provided that the other regression caused by MacWorld hack is also fixed,
    of course.

-- 
Robert Millan

My spam trap is address@hidden  Note: this address is only intended
for spam harvesters.  Writing to it will get you added to my black list.

memory.diff
Description: Text Data