- Kernel's entry point is called KiSystemStartup, not NtProcessStartup (now it's...
authorAleksey Bragin <aleksey@reactos.org>
Fri, 22 Feb 2008 13:41:37 +0000 (13:41 +0000)
committerAleksey Bragin <aleksey@reactos.org>
Fri, 22 Feb 2008 13:41:37 +0000 (13:41 +0000)
svn path=/trunk/; revision=32450

reactos/ntoskrnl/include/internal/ke.h
reactos/ntoskrnl/ke/freeldr.c
reactos/ntoskrnl/ke/i386/boot.S
reactos/ntoskrnl/ke/i386/kiinit.c
reactos/ntoskrnl/ke/powerpc/kiinit.c
reactos/ntoskrnl/ke/powerpc/main_asm.S
reactos/tools/rbuild/module.cpp

index 58075df..81ef211 100644 (file)
@@ -697,7 +697,7 @@ KiInitializeBugCheck(VOID);
 
 VOID
 NTAPI
-KiSystemStartup(
+KiSystemStartupReal(
     IN PLOADER_PARAMETER_BLOCK LoaderBlock
 );
 
index 1558700..f9787cb 100644 (file)
@@ -1330,7 +1330,7 @@ KiRosPrepareForSystemStartup(IN ULONG Dummy,
 #endif
 
     /* Do general System Startup */
-    KiSystemStartup(NtLoaderBlock);
+    KiSystemStartupReal(NtLoaderBlock);
 }
 
 /* EOF */
index d0b1e87..24dd19c 100644 (file)
@@ -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
index 65a7726..3ec1695 100644 (file)
@@ -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;
index c41feaf..9779b19 100644 (file)
@@ -252,7 +252,7 @@ KTRAP_FRAME KiInitialTrapFrame;
 /* Use this for early boot additions to the page table */\r
 VOID\r
 NTAPI\r
-KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)\r
+KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock)\r
 {\r
     ULONG Cpu;\r
     ppc_map_info_t info[4];\r
index 7b313b3..59a8911 100644 (file)
@@ -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
      */
index 2b030ce..116ff66 100644 (file)
@@ -1033,7 +1033,7 @@ Module::GetDefaultModuleEntrypoint () const
        switch ( type )
        {
                case Kernel:
-                       return "NtProcessStartup";
+                       return "KiSystemStartup";
                case KernelModeDLL:
                case KernelModeDriver:
                        return "DriverEntry@8";