Committed. On Mon, Dec 31, 2007 at 04:40:00PM +0100, Christian Franke wrote: > This version of the patch contains only the fix for the E801 EISA memory > map. The memory existence check was helpful for testing but is not > really necessary. > > But this bug should be fixed, otherwise GRUB2 would crash if BIOS does > not provide the E820 memory map. > > Christian > > > 2007-12-31 Christian Franke <[EMAIL PROTECTED]> > > * kern/i386/pc/init.c (grub_machine_init): Fix > evaluation of eisa_mmap. > >
> --- grub2.orig/kern/i386/pc/init.c 2007-10-22 22:22:51.359375000 +0200 > +++ grub2/kern/i386/pc/init.c 2007-12-31 16:05:59.953125000 +0100 > @@ -199,13 +199,8 @@ grub_machine_init (void) > > if (eisa_mmap) > { > - if ((eisa_mmap & 0xFFFF) == 0x3C00) > - add_mem_region (0x100000, (eisa_mmap << 16) + 0x100000 * 15); > - else > - { > - add_mem_region (0x100000, (eisa_mmap & 0xFFFF) << 10); > - add_mem_region (0x1000000, eisa_mmap << 16); > - } > + add_mem_region (0x100000, (eisa_mmap & 0xFFFF) << 10); > + add_mem_region (0x1000000, eisa_mmap & ~0xFFFF); > } > else > add_mem_region (0x100000, grub_get_memsize (1) << 10); > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/grub-devel -- Robert Millan <GPLv2> I know my rights; I want my phone call! <DRM> What use is a phone call, if you are unable to speak? (as seen on /.) _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel