[ros-diffs] [tkreuzer] 48351: [NTOS] - Move initializing the ZeroPageThreadEvent out of architecture specific code - Move setting MmHyperSpaceEnd to a different position

Author: tkreuzer
Date: Thu Jul 29 11:29:25 2010
New Revision: 48351

URL: http://svn.reactos.org/svn/reactos?rev=48351&view=rev
Log:
[NTOS]
- Move initializing the ZeroPageThreadEvent out of architecture specific code
- Move setting MmHyperSpaceEnd to a different position

Modified:
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr...
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Jul 29 11:29:25 2010
@@ -43,9 +43,6 @@
         /* Force the non paged pool to be 2MB so we can reduce RAM usage */
         MmSizeOfNonPagedPoolInBytes = 2 * _1MB;
     }
-    
-    /* Hyperspace ends here */
-    MmHyperSpaceEnd = (PVOID)((ULONG_PTR)MmSystemCacheWorkingSetList - 1);

/* Check if the user gave a ridicuously large nonpaged pool RAM size */
     if ((MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT) > (FreePages * 7 / 8))
@@ -145,8 +142,6 @@
     }
 }

-extern KEVENT ZeroPageThreadEvent;
-
 NTSTATUS
 NTAPI
 MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
@@ -242,8 +237,12 @@
         // We need some recalculations here
         //
         DPRINT1("Paged pool is too big!\n");
-    }
-    
+        ASSERT(FALSE);
+    }
+
+    /* Hyperspace ends here */
+    MmHyperSpaceEnd = (PVOID)((ULONG_PTR)MmSystemCacheWorkingSetList - 1);
+
     //
     // Normally, the PFN database should start after the loader images.
     // This is already the case in ReactOS, but for now we want to co-exist
@@ -354,9 +353,6 @@
     MiInitializeNonPagedPool();
     MiInitializeNonPagedPoolThresholds();

-    /* ReactOS Stuff */
-    KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE);
-    
     /* Build the PFN Database */
     MiInitializePfnDatabase(LoaderBlock);
     MmInitializeBalancer(MmAvailablePages, 0);

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr...
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Jul 29 11:29:25 2010
@@ -15,6 +15,8 @@
 #line 15 "ARM³::INIT"
 #define MODULE_INVOLVED_IN_ARM3
 #include "miarm.h"
+
+extern KEVENT ZeroPageThreadEvent;

/* GLOBALS ********************************************************************/

@@ -1806,8 +1808,10 @@
         MiSessionImagePteStart = MiAddressToPte(MiSessionImageStart);
         MiSessionImagePteEnd = MiAddressToPte(MiSessionImageEnd);
         MiSessionBasePte = MiAddressToPte(MmSessionBase);
-        MiSessionLastPte = MiAddressToPte(MiSessionSpaceEnd);
-                                    
+
+        /* ReactOS Stuff */
+        KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE);
+
         /* Initialize the user mode image list */
         InitializeListHead(&MmLoadedUserImageList);