From f08b9d1821059f1a9de52d25464adec0b410f2c2 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 15 Jul 2010 01:10:18 +0000 Subject: [PATCH] [NTOSKRNL] - Define PD_COUNT, PDE_COUNT, PTE_COUNT for amd64, we should probably use PTE_PER_PAGE... instead - Fix incompatible declaration of MmResidentAvailablePages - Prevent duplicate definitions svn path=/trunk/; revision=48059 --- reactos/ntoskrnl/include/internal/mm.h | 2 +- reactos/ntoskrnl/mm/ARM3/miarm.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h index d8c61786f3f..46f38c5c2ad 100644 --- a/reactos/ntoskrnl/include/internal/mm.h +++ b/reactos/ntoskrnl/include/internal/mm.h @@ -17,7 +17,7 @@ extern UCHAR MmDisablePagingExecutive; extern ULONG MmLowestPhysicalPage; extern ULONG MmHighestPhysicalPage; extern ULONG MmAvailablePages; -extern ULONG MmResidentAvailablePages; +extern PFN_NUMBER MmResidentAvailablePages; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; diff --git a/reactos/ntoskrnl/mm/ARM3/miarm.h b/reactos/ntoskrnl/mm/ARM3/miarm.h index 88b25c46d39..b0240a13364 100644 --- a/reactos/ntoskrnl/mm/ARM3/miarm.h +++ b/reactos/ntoskrnl/mm/ARM3/miarm.h @@ -6,6 +6,8 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ +#ifndef _M_AMD64 + #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) #define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) @@ -38,6 +40,8 @@ #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) +#endif /* !_M_AMD64 */ + /* Make the code cleaner with some definitions for size multiples */ #define _1KB (1024) #define _1MB (1024 * _1KB) @@ -58,7 +62,9 @@ #define PDE_COUNT 4096 #define PTE_COUNT 256 #else -#error Define these please! +#define PD_COUNT PPE_PER_PAGE +#define PDE_COUNT PDE_PER_PAGE +#define PTE_COUNT PTE_PER_PAGE #endif #ifdef _M_IX86 -- 2.17.1