From bae3964e6f3855503ee7189af6f2beed806cc5d1 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 24 Apr 2010 21:52:48 +0100 Subject: [PATCH] [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 --- src/arch/i386/firmware/pcbios/memmap.c | 10 +++++----- 1 file 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 ); } /**