mirror of
https://github.com/reactos/reactos.git
synced 2025-04-25 08:00:24 +00:00
- Only reserve APIC memory on x86
- Don't reserve 32 pages for VGA registers -- deprecated since 11917, 4 years ago - Use KeNumberProcessors instead of MAXIMUM_PROCESSORS when mapping the PCRs - Remove MmInitMemoryAreas, a nop since revision 1093, 8 years ago - Remove unused KeMemoryMapRangeCount/KeMemoryMap svn path=/trunk/; revision=38500
This commit is contained in:
parent
56d6ef019e
commit
fbd7f8a2aa
4 changed files with 3 additions and 37 deletions
|
@ -390,10 +390,6 @@ typedef VOID
|
||||||
|
|
||||||
/* marea.c *******************************************************************/
|
/* marea.c *******************************************************************/
|
||||||
|
|
||||||
NTSTATUS
|
|
||||||
NTAPI
|
|
||||||
MmInitMemoryAreas(VOID);
|
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
NTAPI
|
NTAPI
|
||||||
MmCreateMemoryArea(
|
MmCreateMemoryArea(
|
||||||
|
|
|
@ -18,10 +18,6 @@
|
||||||
KSPIN_LOCK KiFreezeExecutionLock;
|
KSPIN_LOCK KiFreezeExecutionLock;
|
||||||
KSPIN_LOCK Ki486CompatibilityLock;
|
KSPIN_LOCK Ki486CompatibilityLock;
|
||||||
|
|
||||||
/* BIOS Memory Map. Not NTLDR-compliant yet */
|
|
||||||
extern ULONG KeMemoryMapRangeCount;
|
|
||||||
extern ADDRESS_RANGE KeMemoryMap[64];
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
|
|
@ -703,21 +703,6 @@ MmFindGapAtAddress(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @name MmInitMemoryAreas
|
|
||||||
*
|
|
||||||
* Initialize the memory area list implementation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
NTSTATUS
|
|
||||||
INIT_FUNCTION
|
|
||||||
NTAPI
|
|
||||||
MmInitMemoryAreas(VOID)
|
|
||||||
{
|
|
||||||
DPRINT("MmInitMemoryAreas()\n");
|
|
||||||
return(STATUS_SUCCESS);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name MmFreeMemoryArea
|
* @name MmFreeMemoryArea
|
||||||
|
|
|
@ -118,8 +118,6 @@ MmInitVirtualMemory()
|
||||||
|
|
||||||
BoundaryAddressMultiple.QuadPart = 0;
|
BoundaryAddressMultiple.QuadPart = 0;
|
||||||
|
|
||||||
MmInitMemoryAreas();
|
|
||||||
|
|
||||||
DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1,
|
DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1,
|
||||||
MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize - 1);
|
MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize - 1);
|
||||||
|
|
||||||
|
@ -134,13 +132,14 @@ MmInitVirtualMemory()
|
||||||
MmCreateMemoryArea(MmGetKernelAddressSpace(),
|
MmCreateMemoryArea(MmGetKernelAddressSpace(),
|
||||||
MEMORY_AREA_SYSTEM,
|
MEMORY_AREA_SYSTEM,
|
||||||
&BaseAddress,
|
&BaseAddress,
|
||||||
PAGE_SIZE * MAXIMUM_PROCESSORS,
|
PAGE_SIZE * KeNumberProcessors,
|
||||||
PAGE_READWRITE,
|
PAGE_READWRITE,
|
||||||
&MArea,
|
&MArea,
|
||||||
TRUE,
|
TRUE,
|
||||||
0,
|
0,
|
||||||
BoundaryAddressMultiple);
|
BoundaryAddressMultiple);
|
||||||
|
|
||||||
|
#if defined(_M_IX86)
|
||||||
/* Local APIC base */
|
/* Local APIC base */
|
||||||
BaseAddress = (PVOID)0xFEE00000;
|
BaseAddress = (PVOID)0xFEE00000;
|
||||||
MmCreateMemoryArea(MmGetKernelAddressSpace(),
|
MmCreateMemoryArea(MmGetKernelAddressSpace(),
|
||||||
|
@ -164,17 +163,7 @@ MmInitVirtualMemory()
|
||||||
TRUE,
|
TRUE,
|
||||||
0,
|
0,
|
||||||
BoundaryAddressMultiple);
|
BoundaryAddressMultiple);
|
||||||
|
#endif
|
||||||
BaseAddress = (PVOID)0xFF3A0000;
|
|
||||||
MmCreateMemoryArea(MmGetKernelAddressSpace(),
|
|
||||||
MEMORY_AREA_SYSTEM,
|
|
||||||
&BaseAddress,
|
|
||||||
0x20000,
|
|
||||||
PAGE_READWRITE,
|
|
||||||
&MArea,
|
|
||||||
TRUE,
|
|
||||||
0,
|
|
||||||
BoundaryAddressMultiple);
|
|
||||||
|
|
||||||
BaseAddress = MiNonPagedPoolStart;
|
BaseAddress = MiNonPagedPoolStart;
|
||||||
MmCreateMemoryArea(MmGetKernelAddressSpace(),
|
MmCreateMemoryArea(MmGetKernelAddressSpace(),
|
||||||
|
|
Loading…
Reference in a new issue