[ros-diffs] [tkreuzer] 48059: [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

Author: tkreuzer
Date: Thu Jul 15 01:10:18 2010
New Revision: 48059

URL: http://svn.reactos.org/svn/reactos?rev=48059&view=rev
Log:
[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

Modified:
    trunk/reactos/ntoskrnl/include/internal/mm.h
    trunk/reactos/ntoskrnl/mm/ARM3/miarm.h

Modified: trunk/reactos/ntoskrnl/include/internal/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Jul 15 01:10:18 2010
@@ -17,7 +17,7 @@
 extern ULONG MmLowestPhysicalPage;
 extern ULONG MmHighestPhysicalPage;
 extern ULONG MmAvailablePages;
-extern ULONG MmResidentAvailablePages;
+extern PFN_NUMBER MmResidentAvailablePages;
 
 extern PVOID MmPagedPoolBase;
 extern ULONG MmPagedPoolSize;

Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jul 15 01:10:18 2010
@@ -5,6 +5,8 @@
  * PURPOSE:         ARM Memory Manager Header
  * 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)
@@ -37,6 +39,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)
@@ -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