From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1J9Mkh-0007mA-0V for mharc-grub-devel@gnu.org; Mon, 31 Dec 2007 10:40:31 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1J9Mkf-0007lP-AQ for grub-devel@gnu.org; Mon, 31 Dec 2007 10:40:29 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1J9Mke-0007l9-AM for grub-devel@gnu.org; Mon, 31 Dec 2007 10:40:28 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1J9Mke-0007l6-7F for grub-devel@gnu.org; Mon, 31 Dec 2007 10:40:28 -0500 Received: from mailout05.sul.t-online.de ([194.25.134.82] helo=mailout05.sul.t-online.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1J9Mkd-0004Hw-QB for grub-devel@gnu.org; Mon, 31 Dec 2007 10:40:27 -0500 Received: from fwd27.aul.t-online.de by mailout05.sul.t-online.com with smtp id 1J9Mkb-0002aF-00; Mon, 31 Dec 2007 16:40:25 +0100 Received: from [10.3.2.2] (GiCvMOZJwhJHXrGX92sREADO112Sw7xcDnfrTY58JCi-uF6hCCgZlzP3S4MdaxFQZ+@[217.235.241.217]) by fwd27.aul.t-online.de with esmtp id 1J9MkK-1lJUQ40; Mon, 31 Dec 2007 16:40:08 +0100 Message-ID: <47790D50.4060000@t-online.de> Date: Mon, 31 Dec 2007 16:40:00 +0100 From: Christian Franke User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070802 SeaMonkey/1.1.4 MIME-Version: 1.0 To: The development of GRUB 2 References: <471E4628.9030706@t-online.de> <20071118112737.GB16674@thorin> <474202DA.4010001@t-online.de> In-Reply-To: <474202DA.4010001@t-online.de> Content-Type: multipart/mixed; boundary="------------030205060303060809060906" X-ID: GiCvMOZJwhJHXrGX92sREADO112Sw7xcDnfrTY58JCi-uF6hCCgZlzP3S4MdaxFQZ+ X-TOI-MSGID: 72bff4e3-8f0c-48bb-9a0c-7c9d33b681cc X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: Re: [PATCH] Fix eisa_mmap evaluation, add memory existence check X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2007 15:40:29 -0000 This is a multi-part message in MIME format. --------------030205060303060809060906 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 * kern/i386/pc/init.c (grub_machine_init): Fix evaluation of eisa_mmap. --------------030205060303060809060906 Content-Type: text/x-patch; name="grub2-init-eisa_mmap-3.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="grub2-init-eisa_mmap-3.patch" --- 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); --------------030205060303060809060906--