[NTOS] Build mproc.c _only_ for MP ntoskrnl, not for single-processor

The usage of the BUILD_MP cmake variable was inadequate.

Author: HBelusca

ntoskrnl/CMakeLists.txt

@@ -52,9 +52,7 @@ add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${PCH_SKIP_S
 add_dependencies(ntoskrnl psdk asm)
 add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all)
 
-if(BUILD_MP)
-    add_subdirectory(ntkrnlmp)
-endif()
+add_subdirectory(ntkrnlmp)
 
 add_asm_files(ntdllsys_asm ntdll.S)
 add_library(ntdllsys ${ntdllsys_asm})

ntoskrnl/ntkrnlmp/CMakeLists.txt

@@ -10,6 +10,16 @@ endif()
 
 add_asm_files(ntkrnlmp_asm ${NTKRNLMP_ASM_SOURCE})
 
+if(ARCH STREQUAL "i386")
+    list(APPEND NTKRNLMP_SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/mproc.c)
+elseif(ARCH STREQUAL "amd64")
+    list(APPEND NTKRNLMP_SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/mproc.c)
+elseif(ARCH STREQUAL "arm")
+    #TBD
+endif()
+
 list(APPEND NTKRNLMP_PCH_SKIP_SOURCE
     ${REACTOS_SOURCE_DIR}/ntoskrnl/guid.c)
 

ntoskrnl/ntos.cmake

@@ -334,10 +334,6 @@ if(ARCH STREQUAL "i386")
         ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/i386/psldt.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/vdm/vdmmain.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/vdm/vdmexec.c)
-    if(BUILD_MP)
-        list(APPEND SOURCE
-            ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/mproc.c)
-    endif()
 elseif(ARCH STREQUAL "amd64")
     list(APPEND ASM_SOURCE
         ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/boot.S
@@ -366,10 +362,6 @@ elseif(ARCH STREQUAL "amd64")
         ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/stubs.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/traphandler.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/usercall.c)
-    if(BUILD_MP)
-        list(APPEND SOURCE
-            ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/mproc.c)
-    endif()
 elseif(ARCH STREQUAL "arm")
     list(APPEND ASM_SOURCE
         ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/arm/ioport.s