[ros-diffs] [fireball] 29360: - Temporary revert 29342. See issue #2715 for more details.

[fireball at svn.reactos.org]

Author: fireball
Date: Wed Oct  3 00:09:31 2007
New Revision: 29360

URL: http://svn.reactos.org/svn/reactos?rev=29360&view=rev
Log:
- Temporary revert 29342.
See issue #2715 for more details.

Modified:
    trunk/reactos/ntoskrnl/ke/i386/kiinit.c
    trunk/reactos/ntoskrnl/mm/mminit.c

Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?rev=29360&r1=29359&r2=29360&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original)
+++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Wed Oct  3 00:09:31 2007
@@ -17,6 +17,10 @@
 /* Spinlocks used only on X86 */
 KSPIN_LOCK KiFreezeExecutionLock;
 KSPIN_LOCK Ki486CompatibilityLock;
+
+/* BIOS Memory Map. Not NTLDR-compliant yet */
+extern ULONG KeMemoryMapRangeCount;
+extern ADDRESS_RANGE KeMemoryMap[64];
 
 /* FUNCTIONS *****************************************************************/
 
@@ -532,6 +536,14 @@
     /* HACK for MmUpdatePageDir */
     ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess;
 
+    /* Initialize Kernel Memory Address Space */
+    MmInit1(MmFreeLdrFirstKrnlPhysAddr,
+            MmFreeLdrLastKrnlPhysAddr,
+            MmFreeLdrLastKernelAddress,
+            KeMemoryMap,
+            KeMemoryMapRangeCount,
+            4096);
+
     /* Set basic CPU Features that user mode can read */
     SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] =
         (KeFeatureBits & KF_MMX) ? TRUE: FALSE;

Modified: trunk/reactos/ntoskrnl/mm/mminit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=29360&r1=29359&r2=29360&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mminit.c (original)
+++ trunk/reactos/ntoskrnl/mm/mminit.c Wed Oct  3 00:09:31 2007
@@ -16,10 +16,19 @@
 
 /* GLOBALS *****************************************************************/
 
-BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady;
-extern KMUTANT MmSystemLoadLock;
-extern ULONG KeMemoryMapRangeCount;
-extern ADDRESS_RANGE KeMemoryMap[64];
+/*
+ * Compiler defined symbols
+ */
+#if 0
+extern unsigned int _image_base__;
+extern unsigned int _text_start__;
+extern unsigned int _text_end__;
+
+extern unsigned int _init_start__;
+extern unsigned int _init_end__;
+
+extern unsigned int _bss_end__;
+#endif
 
 static BOOLEAN IsThisAnNtAsSystem = FALSE;
 MM_SYSTEMSIZE MmSystemSize = MmSmallSystem;
@@ -413,6 +422,9 @@
    MmInitializeMdlImplementation();
 }
 
+BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady;
+extern KMUTANT MmSystemLoadLock;
+
 BOOLEAN
 NTAPI
 MmInitSystem(IN ULONG Phase,
@@ -421,14 +433,6 @@
     ULONG Flags = 0;
     if (Phase == 0)
     {
-        /* Initialize Kernel Memory Address Space */
-        MmInit1(MmFreeLdrFirstKrnlPhysAddr,
-                MmFreeLdrLastKrnlPhysAddr,
-                MmFreeLdrLastKernelAddress,
-                KeMemoryMap,
-                KeMemoryMapRangeCount,
-                4096);
-
         /* Initialize the Loader Lock */
         KeInitializeMutant(&MmSystemLoadLock, FALSE);