From: Michael Brown <mcb30@etherboot.org>
Date: Mon, 22 Sep 2008 23:58:12 +0000 (+0100)
Subject: [memmap] Allow for 4GB+ systems in debug message
X-Git-Tag: v0.9.4~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fd1e54026d9c941fce041157bb00cb42fdef9dd;p=thirdparty%2Fipxe.git

[memmap] Allow for 4GB+ systems in debug message

INT 15,e801 is capable of returning a memory range that extends to
4GB, so allow for this in the debug message that shows the data
returned by INT 15,e801.
---

diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c
index fc0d36ace..f88131621 100644
--- a/src/arch/i386/firmware/pcbios/memmap.c
+++ b/src/arch/i386/firmware/pcbios/memmap.c
@@ -86,9 +86,9 @@ static unsigned int extmemsize_e801 ( void ) {
 	}
 
 	extmem = ( extmem_1m_to_16m_k + ( extmem_16m_plus_64k * 64 ) );
-	DBG ( "INT 15,e801 extended memory size %d+64*%d=%d kB [100000,%x)\n",
-	      extmem_1m_to_16m_k, extmem_16m_plus_64k, extmem,
-	      ( 0x100000 + ( extmem * 1024 ) ) );
+	DBG ( "INT 15,e801 extended memory size %d+64*%d=%d kB "
+	      "[100000,%llx)\n", extmem_1m_to_16m_k, extmem_16m_plus_64k,
+	      extmem, ( 0x100000 + ( ( ( uint64_t ) extmem ) * 1024 ) ) );
 	return extmem;
 }