From 2bff2de347b55b9cfe365f94a215023df8efd259 Mon Sep 17 00:00:00 2001 From: robertmh Date: Fri, 4 Jan 2008 08:31:36 +0000 Subject: [PATCH] 2008-01-04 Christian Franke * kern/i386/pc/init.c (grub_machine_init): Fix evaluation of eisa_mmap. --- ChangeLog | 5 +++++ kern/i386/pc/init.c | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b91edea6..4439f5fa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-04 Christian Franke + + * kern/i386/pc/init.c (grub_machine_init): Fix evaluation + of eisa_mmap. + 2008-01-03 Pavel Roskin * kern/i386/linuxbios/init.c: Put "void" to all function diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c index 72ff9a290..b1c7984fd 100644 --- a/kern/i386/pc/init.c +++ b/kern/i386/pc/init.c @@ -1,6 +1,6 @@ /* * 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 * it under the terms of the GNU General Public License as published by @@ -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);