From 0c8475d7cae75eceb4eba17fd323650f23036cb4 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Fri, 22 Feb 2008 13:41:37 +0000
Subject: [PATCH] - Kernel's entry point is called KiSystemStartup, not
 NtProcessStartup (now it's done correctly).

svn path=/trunk/; revision=32450
---
 reactos/ntoskrnl/include/internal/ke.h | 2 +-
 reactos/ntoskrnl/ke/freeldr.c          | 2 +-
 reactos/ntoskrnl/ke/i386/boot.S        | 6 +++---
 reactos/ntoskrnl/ke/i386/kiinit.c      | 2 +-
 reactos/ntoskrnl/ke/powerpc/kiinit.c   | 2 +-
 reactos/ntoskrnl/ke/powerpc/main_asm.S | 3 +--
 reactos/tools/rbuild/module.cpp        | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index 58075df2102..81ef21172e2 100644
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -697,7 +697,7 @@ KiInitializeBugCheck(VOID);
 
 VOID
 NTAPI
-KiSystemStartup(
+KiSystemStartupReal(
     IN PLOADER_PARAMETER_BLOCK LoaderBlock
 );
 
diff --git a/reactos/ntoskrnl/ke/freeldr.c b/reactos/ntoskrnl/ke/freeldr.c
index 1558700629f..f9787cbc99e 100644
--- a/reactos/ntoskrnl/ke/freeldr.c
+++ b/reactos/ntoskrnl/ke/freeldr.c
@@ -1330,7 +1330,7 @@ KiRosPrepareForSystemStartup(IN ULONG Dummy,
 #endif
 
     /* Do general System Startup */
-    KiSystemStartup(NtLoaderBlock);
+    KiSystemStartupReal(NtLoaderBlock);
 }
 
 /* EOF */
diff --git a/reactos/ntoskrnl/ke/i386/boot.S b/reactos/ntoskrnl/ke/i386/boot.S
index d0b1e87755a..24dd19cde4b 100644
--- a/reactos/ntoskrnl/ke/i386/boot.S
+++ b/reactos/ntoskrnl/ke/i386/boot.S
@@ -29,12 +29,12 @@ _KiDoubleFaultStack:
 /* FUNCTIONS *****************************************************************/
 
 .text
-.func NtProcessStartup
-_NtProcessStartup:
+.func KiSystemStartup
+_KiSystemStartup:
 
     /* NTLDR Boot: Call the main kernel initialization */
     test dword ptr [esp+4], 0x80000000
-    jnz _KiSystemStartup@4
+    jnz _KiSystemStartupReal@4
 
     /* FREELDR Boot: Cal the FreeLDR wrapper */
     jmp @KiRosPrepareForSystemStartup@8
diff --git a/reactos/ntoskrnl/ke/i386/kiinit.c b/reactos/ntoskrnl/ke/i386/kiinit.c
index 65a7726091e..3ec1695aa3e 100644
--- a/reactos/ntoskrnl/ke/i386/kiinit.c
+++ b/reactos/ntoskrnl/ke/i386/kiinit.c
@@ -646,7 +646,7 @@ KiGetMachineBootPointers(IN PKGDTENTRY *Gdt,
 
 VOID
 NTAPI
-KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     ULONG Cpu;
     PKTHREAD InitialThread;
diff --git a/reactos/ntoskrnl/ke/powerpc/kiinit.c b/reactos/ntoskrnl/ke/powerpc/kiinit.c
index c41feaf110e..9779b193424 100644
--- a/reactos/ntoskrnl/ke/powerpc/kiinit.c
+++ b/reactos/ntoskrnl/ke/powerpc/kiinit.c
@@ -252,7 +252,7 @@ KTRAP_FRAME KiInitialTrapFrame;
 /* Use this for early boot additions to the page table */
 VOID
 NTAPI
-KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     ULONG Cpu;
     ppc_map_info_t info[4];
diff --git a/reactos/ntoskrnl/ke/powerpc/main_asm.S b/reactos/ntoskrnl/ke/powerpc/main_asm.S
index 7b313b3945e..59a891105fd 100644
--- a/reactos/ntoskrnl/ke/powerpc/main_asm.S
+++ b/reactos/ntoskrnl/ke/powerpc/main_asm.S
@@ -33,12 +33,11 @@ _kernel_trap_stack_top:
 KiDoubleFaultStack:	
 	
 	.text
-	.globl NtProcessStartup
 	.globl KiSystemStartup
 	.globl KiRosPrepareForSystemStartup
 	.globl DrawNumber
 	
-NtProcessStartup:
+KiSystemStartup:
     /*
      * Set a normal MSR value
      */
diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 2b030ce97cd..116ff669a9c 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1033,7 +1033,7 @@ Module::GetDefaultModuleEntrypoint () const
 	switch ( type )
 	{
 		case Kernel:
-			return "NtProcessStartup";
+			return "KiSystemStartup";
 		case KernelModeDLL:
 		case KernelModeDriver:
 			return "DriverEntry@8";
-- 
2.17.1