diff --git a/reactos/ntoskrnl/include/internal/amd64/mm.h b/reactos/ntoskrnl/include/internal/amd64/mm.h index 1889c64209f..f0d43426b98 100644 --- a/reactos/ntoskrnl/include/internal/amd64/mm.h +++ b/reactos/ntoskrnl/include/internal/amd64/mm.h @@ -25,6 +25,8 @@ #define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL +#define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(KSEG0_BASE) + /* Memory sizes */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) @@ -48,6 +50,10 @@ #define MI_SECONDARY_COLORS 64 #define MI_MAX_SECONDARY_COLORS 1024 +#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) +#define MI_ALLOCATION_FRAGMENT (64 * _1KB) +#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) + #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) diff --git a/reactos/ntoskrnl/kd64/kddata.c b/reactos/ntoskrnl/kd64/kddata.c index edce7d7983f..895753a98d2 100644 --- a/reactos/ntoskrnl/kd64/kddata.c +++ b/reactos/ntoskrnl/kd64/kddata.c @@ -9,9 +9,9 @@ /* INCLUDES ******************************************************************/ #include -#include "../mm/ARM3/miarm.h" #define NDEBUG #include +#include "../mm/ARM3/miarm.h" VOID NTAPI RtlpBreakWithStatusInstruction(VOID); diff --git a/reactos/ntoskrnl/mm/ARM3/miarm.h b/reactos/ntoskrnl/mm/ARM3/miarm.h index e7b22e2d1d7..417544c0913 100644 --- a/reactos/ntoskrnl/mm/ARM3/miarm.h +++ b/reactos/ntoskrnl/mm/ARM3/miarm.h @@ -33,7 +33,6 @@ #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 #define MI_DEBUG_MAPPING (PVOID)0xFFBFF000 -// on AMD64 this would be MiAddressToPte(MM_KSEG0_BASE) #define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(NULL) #define MI_MIN_SECONDARY_COLORS 8 @@ -392,7 +391,7 @@ extern BOOLEAN MmDynamicPfn; extern BOOLEAN MmMirroring; extern BOOLEAN MmMakeLowMemory; extern BOOLEAN MmEnforceWriteProtection; -extern ULONG MmAllocationFragment; +extern SIZE_T MmAllocationFragment; extern ULONG MmConsumedPoolPercentage; extern ULONG MmVerifyDriverBufferType; extern ULONG MmVerifyDriverLevel; diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c index 8761620434d..a09a0a3d7ad 100644 --- a/reactos/ntoskrnl/mm/section.c +++ b/reactos/ntoskrnl/mm/section.c @@ -71,7 +71,7 @@ MM_SECTION_PAGEOUT_CONTEXT; POBJECT_TYPE MmSectionObjectType = NULL; -BOOLEAN MmAllocationFragment; +SIZE_T MmAllocationFragment; ULONG_PTR MmSubsectionBase;