summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brown2010-04-24 22:52:48 +0200
committerMichael Brown2010-04-25 02:50:46 +0200
commitbae3964e6f3855503ee7189af6f2beed806cc5d1 (patch)
treed4832dc08712d8ee0ef01e147a73dc133d9df705 /src
parent[build] Generate random build identifier (diff)
downloadipxe-bae3964e6f3855503ee7189af6f2beed806cc5d1.tar.gz
ipxe-bae3964e6f3855503ee7189af6f2beed806cc5d1.tar.xz
ipxe-bae3964e6f3855503ee7189af6f2beed806cc5d1.zip
[pcbios] Always show INT 15,88 result under DEBUG=memmap
Always call INT 15,88 even if we don't use the result. This allows DEBUG=memmap to show the complete result set returned by all of the INT 15 memory-map calls. Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/firmware/pcbios/memmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c
index c53a35f5..8fa1f4c3 100644
--- a/src/arch/i386/firmware/pcbios/memmap.c
+++ b/src/arch/i386/firmware/pcbios/memmap.c
@@ -139,13 +139,13 @@ static unsigned int extmemsize_88 ( void ) {
* use the E820 memory map obtained via get_memmap();
*/
unsigned int extmemsize ( void ) {
- unsigned int extmem;
+ unsigned int extmem_e801;
+ unsigned int extmem_88;
/* Try INT 15,e801 first, then fall back to INT 15,88 */
- extmem = extmemsize_e801();
- if ( ! extmem )
- extmem = extmemsize_88();
- return extmem;
+ extmem_88 = extmemsize_88();
+ extmem_e801 = extmemsize_e801();
+ return ( extmem_e801 ? extmem_e801 : extmem_88 );
}
/**