From 20da260a3c4cee7b2198a2d9c77dab9ba12bd43b Mon Sep 17 00:00:00 2001 From: Casper Hornstrup Date: Sat, 14 Jul 2001 21:10:31 +0000 Subject: [PATCH] Temporary fix to prevent a crash when running in VMware (and possibly bochs too) svn path=/trunk/; revision=2060 --- reactos/ntoskrnl/ke/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c index 5b5e5f94eb3..f49369114bb 100644 --- a/reactos/ntoskrnl/ke/main.c +++ b/reactos/ntoskrnl/ke/main.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: main.c,v 1.100 2001/07/12 17:23:42 ekohl Exp $ +/* $Id: main.c,v 1.101 2001/07/14 21:10:31 chorns Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/main.c @@ -758,6 +758,11 @@ _main (ULONG MultiBootMagic, PLOADER_PARAMETER_BLOCK _LoaderBlock) LastKrnlPhysAddr = last_kernel_address - 0xc0000000 + 0x200000; LastKernelAddress = last_kernel_address; +#ifndef ACPI + /* FIXME: VMware does not like it when ReactOS is using the BIOS memory map */ + KeLoaderBlock.Flags &= ~MB_FLAGS_MMAP_INFO; +#endif + KeMemoryMapRangeCount = 0; if (KeLoaderBlock.Flags & MB_FLAGS_MMAP_INFO) {