Author: tkreuzer Date: Wed Jul 28 22:59:33 2010 New Revision: 48337
URL: http://svn.reactos.org/svn/reactos?rev=48337&view=rev Log: reduce diff to trunk
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Jul 28 22:59:33 2010 @@ -373,19 +373,20 @@ VOID MiInitializePageTable() { - ULONG64 PageFrameOffset; + ULONG64 PxePhysicalAddress; MMPTE TmplPte, *Pte; + PFN_NUMBER PxePfn;
/* HACK: don't use freeldr debug print anymore */ //FrLdrDbgPrint = NoDbgPrint;
/* Get current directory base */ - MmSystemPageDirectory[0] = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber; - PageFrameOffset = MmSystemPageDirectory[0] << PAGE_SHIFT; - ASSERT(PageFrameOffset == __readcr3()); + PxePfn = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber; + PxePhysicalAddress = PxePfn << PAGE_SHIFT; + ASSERT(PxePhysicalAddress == __readcr3());
/* Set directory base for the system process */ - PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; + PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PxePhysicalAddress;
/* Enable global pages */ __writecr4(__readcr4() | CR4_PGE);