i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: Disable PAE, if 4 GB memory limit safemode is set

Browse Source
This commit is contained in:
Ingo Weinhold
2013-12-10 19:07:01 +01:00
parent 9bdb5e0a92
commit 647b768f54
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_vm_translation_map.cpp
+9 -3
View File
@@ -11,6 +11,7 @@
#include <arch/vm_translation_map.h> #include <arch/vm_translation_map.h>
#include <boot/kernel_args.h> #include <boot/kernel_args.h>
#include <safemode.h>
#ifdef __x86_64__ #ifdef __x86_64__
# include "paging/64bit/X86PagingMethod64Bit.h" # include "paging/64bit/X86PagingMethod64Bit.h"
@@ -99,12 +100,17 @@ arch_vm_translation_map_init(kernel_args *args,
} }
} }
if (paeAvailable && paeNeeded) { bool paeDisabled = get_safemode_boolean_early(args,
B_SAFEMODE_4_GB_MEMORY_LIMIT, false);
if (paeAvailable && paeNeeded && !paeDisabled) {
dprintf("using PAE paging\n"); dprintf("using PAE paging\n");
gX86PagingMethod = new(&sPagingMethodBuffer) X86PagingMethodPAE; gX86PagingMethod = new(&sPagingMethodBuffer) X86PagingMethodPAE;
} else { } else {
dprintf("using 32 bit paging (PAE not %s)\n", dprintf("using 32 bit paging (PAE %s)\n",
paeNeeded ? "available" : "needed"); paeNeeded
? "not available"
: (paeDisabled ? "disabled" : "not needed"));
gX86PagingMethod = new(&sPagingMethodBuffer) X86PagingMethod32Bit; gX86PagingMethod = new(&sPagingMethodBuffer) X86PagingMethod32Bit;
} }
#else #else