From 23abd61d3e4986f4ff602378aeff37ed83d5eadf Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sat, 25 Jul 2009 11:43:48 +0000 Subject: [PATCH] - Fix some kernel MSC compilation issues: - ShutdownThreadMain: Define SMP-only variables compatibly - MmArmInitSystem: Define MiNonPagedPoolStart and MiNonPagedPoolLength externs compatibly - KdbpCallMainLoop: Add VOID to parameter list svn path=/trunk/; revision=42204 --- reactos/ntoskrnl/ex/shutdown.c | 7 ++++--- reactos/ntoskrnl/kdbg/kdb.c | 2 +- reactos/ntoskrnl/mm/ARM3/i386/init.c | 8 ++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/reactos/ntoskrnl/ex/shutdown.c b/reactos/ntoskrnl/ex/shutdown.c index 431922ba312..b83ca0edcdb 100644 --- a/reactos/ntoskrnl/ex/shutdown.c +++ b/reactos/ntoskrnl/ex/shutdown.c @@ -133,6 +133,10 @@ ShutdownThreadMain(PVOID Context) "\n" }; LARGE_INTEGER Now; +#ifdef CONFIG_SMP + LONG i; + KIRQL OldIrql; +#endif /* Run the thread on the boot processor */ KeSetSystemAffinityThread(1); @@ -172,9 +176,6 @@ ShutdownThreadMain(PVOID Context) HalReturnToFirmware (FIRMWARE_OFF); #else #ifdef CONFIG_SMP - LONG i; - KIRQL OldIrql; - OldIrql = KeRaiseIrqlToDpcLevel(); /* Halt all other processors */ for (i = 0; i < KeNumberProcessors; i++) diff --git a/reactos/ntoskrnl/kdbg/kdb.c b/reactos/ntoskrnl/kdbg/kdb.c index 17bfc0ffd2c..00fb9d5f12b 100644 --- a/reactos/ntoskrnl/kdbg/kdb.c +++ b/reactos/ntoskrnl/kdbg/kdb.c @@ -1175,7 +1175,7 @@ KdbpAttachToProcess( /*!\brief Calls the main loop ... */ static VOID -KdbpCallMainLoop() +KdbpCallMainLoop(VOID) { KdbpCliMainLoop(KdbEnteredOnSingleStep); } diff --git a/reactos/ntoskrnl/mm/ARM3/i386/init.c b/reactos/ntoskrnl/mm/ARM3/i386/init.c index 08033734422..a3e886bae75 100644 --- a/reactos/ntoskrnl/mm/ARM3/i386/init.c +++ b/reactos/ntoskrnl/mm/ARM3/i386/init.c @@ -95,6 +95,12 @@ PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; +// +// Old ReactOS Mm nonpaged pool +// +extern PVOID MiNonPagedPoolStart; +extern ULONG MiNonPagedPoolLength; + // // This is where paged pool starts by default // @@ -1211,8 +1217,6 @@ MmArmInitSystem(IN ULONG Phase, // // Print the memory layout // - extern PVOID MiNonPagedPoolStart; - extern ULONG MiNonPagedPoolLength; DPRINT1(" 0x%p - 0x%p\t%s\n", MmSystemRangeStart, (ULONG_PTR)MmSystemRangeStart + MmBootImageSize,