Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 20:43:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed the sequence of some memory initialisation functions.

Browse source 
svn path=/trunk/; revision=10608
This commit is contained in:
Hartmut Birr 2004-08-19 22:17:47 +00:00
parent a9797a23d6
commit 147f2a9166
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/ntoskrnl/mm/mminit.c
View file

@ -1,4 +1,4 @@
/* $Id: mminit.c,v 1.66 2004/08/15 16:39:08 chorns Exp $
/* $Id: mminit.c,v 1.67 2004/08/19 22:17:47 hbirr Exp $
*
* COPYRIGHT: See COPYING in the top directory
* PROJECT: ReactOS kernel
@ -341,8 +341,6 @@ MmInit1(ULONG FirstKrnlPhysAddr,
MmUserProbeAddress = (PVOID)0x7fff0000;
MmHighestUserAddress = (PVOID)0x7ffeffff;
MmInitGlobalKernelPageDirectory();
/*
* Initialize memory managment statistics
*/
@ -357,20 +355,6 @@ MmInit1(ULONG FirstKrnlPhysAddr,
MmStats.PagingRequestsInLastFiveMinutes = 0;
MmStats.PagingRequestsInLastFifteenMinutes = 0;
/*
* Initialize the kernel address space
*/
MmInitializeKernelAddressSpace();
/*
* Unmap low memory
*/
#ifndef MP
/* In SMP mode we unmap the low memory in MmInit3.
The APIC needs the mapping of the first pages
while the processors are starting up. */
MmDeletePageTable(NULL, 0);
#endif
/*
* Free all pages not used for kernel memory
* (we assume the kernel occupies a continuous range of physical
@ -397,9 +381,17 @@ MmInit1(ULONG FirstKrnlPhysAddr,
MmStats.NrTotalPages += 16;
#endif
/*
* Initialize the kernel address space
*/
MmInitializeKernelAddressSpace();
MmInitGlobalKernelPageDirectory();
MiInitKernelMap();
DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024);
LastKernelAddress = (ULONG)MmInitializePageList((PVOID)FirstKrnlPhysAddr,
@ -410,11 +402,20 @@ MmInit1(ULONG FirstKrnlPhysAddr,
AddressRangeCount);
kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr;
/*
* Unmap low memory
*/
#ifndef MP
/* In SMP mode we unmap the low memory in MmInit3.
The APIC needs the mapping of the first pages
while the processors are starting up. */
MmDeletePageTable(NULL, 0);
#endif
/*
* Create a trap for null pointer references and protect text
* segment
*/
CHECKPOINT;
DPRINT("_text_start__ %x _init_end__ %x\n",(int)&_text_start__,(int)&_init_end__);
for (i=PAGE_ROUND_DOWN(((int)&_text_start__));
i<PAGE_ROUND_UP(((int)&_init_end__));i=i+PAGE_SIZE)