vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-01-04 Christian Franke <franke@computer.org>

Browse source 
* kern/i386/pc/init.c (grub_machine_init): Fix evaluation
        of eisa_mmap.
This commit is contained in:
robertmh 2008-01-04 08:31:36 +00:00
parent 97eab9176c
commit 2bff2de347
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-01-04 Christian Franke <franke@computer.org>
* kern/i386/pc/init.c (grub_machine_init): Fix evaluation
of eisa_mmap.
2008-01-03 Pavel Roskin <proski@gnu.org> 2008-01-03 Pavel Roskin <proski@gnu.org>
* kern/i386/linuxbios/init.c: Put "void" to all function * kern/i386/linuxbios/init.c: Put "void" to all function

9
kern/i386/pc/init.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc. * Copyright (C) 2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -198,14 +198,9 @@ grub_machine_init (void)
grub_uint32_t eisa_mmap = grub_get_eisa_mmap (); grub_uint32_t eisa_mmap = grub_get_eisa_mmap ();
if (eisa_mmap) 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 (0x100000, (eisa_mmap & 0xFFFF) << 10);
add_mem_region (0x1000000, eisa_mmap << 16); add_mem_region (0x1000000, eisa_mmap & ~0xFFFF);
}
} }
else else
add_mem_region (0x100000, grub_get_memsize (1) << 10); add_mem_region (0x100000, grub_get_memsize (1) << 10);