From: Pierre Schweitzer <pierre@reactos.org>
Date: Wed, 24 Nov 2010 17:24:54 +0000 (+0000)
Subject: [NTOSKRNL]
X-Git-Tag: backups/ros-branch-0_3_13@51035~420
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=85adb4ff8048f1dbb3dbe8aad8f7bed8e4a2c6a1

[NTOSKRNL]
That's not because ARM will rule the world on a day that you're obliged to break x86 build.
Fixed build. Will it work? Only God knows.

svn path=/trunk/; revision=49779
---

diff --git a/reactos/ntoskrnl/include/internal/i386/mm.h b/reactos/ntoskrnl/include/internal/i386/mm.h
index e8cfd55ae77..2f70fd5e2f3 100644
--- a/reactos/ntoskrnl/include/internal/i386/mm.h
+++ b/reactos/ntoskrnl/include/internal/i386/mm.h
@@ -39,6 +39,7 @@ PULONG MmGetPageDirectory(VOID);
 // Convert a PTE into a corresponding address
 //
 #define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10))
+#define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 18))
 
 #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE))
 #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE)))
@@ -55,7 +56,7 @@ PULONG MmGetPageDirectory(VOID);
 #define MI_PAGE_DISABLE_CACHE(x)   ((x)->u.Hard.CacheDisable = 1)
 #define MI_PAGE_WRITE_THROUGH(x)   ((x)->u.Hard.WriteThrough = 1)
 #define MI_PAGE_WRITE_COMBINED(x)  ((x)->u.Hard.WriteThrough = 0)
-#define MI_IS_PAGE_LARGE(x)        ((x)->u.Hard.Large == 1)
+#define MI_IS_PAGE_LARGE(x)        ((x)->u.Hard.LargePage == 1)
 #if !defined(CONFIG_SMP)
 #define MI_IS_PAGE_WRITEABLE(x)    ((x)->u.Hard.Write == 1)
 #else
@@ -81,6 +82,18 @@ PULONG MmGetPageDirectory(VOID);
 
 #define TEB_BASE                            0x7FFDE000
 
+#define MI_HYPERSPACE_PTES                  (256 - 1)
+#define MI_ZERO_PTES                        (32)
+#define MI_MAPPING_RANGE_START              (ULONG)HYPER_SPACE
+#define MI_MAPPING_RANGE_END                (MI_MAPPING_RANGE_START + \
+	                                              MI_HYPERSPACE_PTES * PAGE_SIZE)
+#define MI_DUMMY_PTE                        (PMMPTE)(MI_MAPPING_RANGE_END + \
+	                                              PAGE_SIZE)
+#define MI_VAD_BITMAP                       (PMMPTE)(MI_DUMMY_PTE + \
+	                                              PAGE_SIZE)
+#define MI_WORKING_SET_LIST                 (PMMPTE)(MI_VAD_BITMAP + \
+	                                              PAGE_SIZE)
+
 /* On x86, these two are the same */
 #define MMPDE MMPTE
 #define PMMPDE PMMPTE