aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'memdisk/setup.c')
-rw-r--r--memdisk/setup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/memdisk/setup.c b/memdisk/setup.c
index e75bcb40..2ab5b98d 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -473,6 +473,9 @@ uint32_t setup(void)
dosmem_k = rdz_16(BIOS_BASEMEM);
pptr->olddosmem = dosmem_k;
stddosmem = dosmem_k << 10;
+ /* If INT 15 E820 and INT 12 disagree, go with the most conservative */
+ if ( stddosmem > dos_mem )
+ stddosmem = dos_mem;
pptr->driveno = geometry->driveno;
pptr->drivetype = geometry->type;