From 3a3d75946e623f76383d3e0638fc56ac6b177df7 Mon Sep 17 00:00:00 2001 From: Sir Richard Date: Tue, 2 Nov 2010 14:58:39 +0000 Subject: [PATCH] [NTOS]: Misc typo and cleanup fixes. svn path=/trunk/; revision=49441 --- reactos/ntoskrnl/include/internal/mm.h | 4 ++-- reactos/ntoskrnl/kd/kdmain.c | 4 ++-- reactos/ntoskrnl/mm/ARM3/i386/init.c | 3 +-- reactos/ntoskrnl/mm/ARM3/mminit.c | 2 +- reactos/ntoskrnl/mm/ARM3/pagfault.c | 4 ++-- reactos/ntoskrnl/mm/freelist.c | 8 -------- 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h index 9da455b0779..e664d1c99c3 100644 --- a/reactos/ntoskrnl/include/internal/mm.h +++ b/reactos/ntoskrnl/include/internal/mm.h @@ -1150,8 +1150,8 @@ MmInitializePageList( VOID NTAPI -MmDumpPfnDatabase( - VOID +MmDumpArmPfnDatabase( + IN BOOLEAN StatusOnly ); PFN_NUMBER diff --git a/reactos/ntoskrnl/kd/kdmain.c b/reactos/ntoskrnl/kd/kdmain.c index 0d649112016..6b16582735a 100644 --- a/reactos/ntoskrnl/kd/kdmain.c +++ b/reactos/ntoskrnl/kd/kdmain.c @@ -72,8 +72,8 @@ KdpServiceDispatcher(ULONG Service, DbgBreakPoint(); break; - case ThatsWhatSheSaid: - MmDumpPfnDatabase(); + case KdSpare3: + MmDumpArmPfnDatabase(FALSE); break; default: diff --git a/reactos/ntoskrnl/mm/ARM3/i386/init.c b/reactos/ntoskrnl/mm/ARM3/i386/init.c index 1d0a41c79ac..b2bc4afacc6 100644 --- a/reactos/ntoskrnl/mm/ARM3/i386/init.c +++ b/reactos/ntoskrnl/mm/ARM3/i386/init.c @@ -307,11 +307,10 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) MiComputeColorInformation(); // - // Calculate the number of bytes for the PFN database, double it for ARM3, + // Calculate the number of bytes for the PFN database // then add the color tables and convert to pages // MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); - //MxPfnAllocation <<= 1; MxPfnAllocation += (MmSecondaryColors * sizeof(MMCOLOR_TABLES) * 2); MxPfnAllocation >>= PAGE_SHIFT; diff --git a/reactos/ntoskrnl/mm/ARM3/mminit.c b/reactos/ntoskrnl/mm/ARM3/mminit.c index 2a63047f837..d6c2a2b65e6 100644 --- a/reactos/ntoskrnl/mm/ARM3/mminit.c +++ b/reactos/ntoskrnl/mm/ARM3/mminit.c @@ -1215,7 +1215,7 @@ MiAddHalIoMappings(VOID) VOID NTAPI -MmDumpArmPfnDatabase(VOID) +MmDumpArmPfnDatabase(IN BOOLEAN StatusOnly) { ULONG i; PMMPFN Pfn1; diff --git a/reactos/ntoskrnl/mm/ARM3/pagfault.c b/reactos/ntoskrnl/mm/ARM3/pagfault.c index 50304dad896..a893dcaca25 100644 --- a/reactos/ntoskrnl/mm/ARM3/pagfault.c +++ b/reactos/ntoskrnl/mm/ARM3/pagfault.c @@ -594,13 +594,13 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, PointerPte, Process, MM_NOIRQL); - ASSERT(KeAreAllApcsDisabled () == TRUE); + ASSERT(KeAreAllApcsDisabled() == TRUE); if (NT_SUCCESS(Status)) { // // Make sure we're returning in a sane state and pass the status down // - ASSERT(OldIrql == KeGetCurrentIrql ()); + ASSERT(OldIrql == KeGetCurrentIrql()); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); return Status; } diff --git a/reactos/ntoskrnl/mm/freelist.c b/reactos/ntoskrnl/mm/freelist.c index c7895352d11..7dfa1620721 100644 --- a/reactos/ntoskrnl/mm/freelist.c +++ b/reactos/ntoskrnl/mm/freelist.c @@ -379,14 +379,6 @@ MiAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, return Mdl; } -VOID -NTAPI -MmDumpPfnDatabase(VOID) -{ - /* Pretty useless for now, to be improved later */ - return; -} - VOID NTAPI MmSetRmapListHeadPage(PFN_NUMBER Pfn, PMM_RMAP_ENTRY ListHead)