- Fix accidental build breakage. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/process.c _____
Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ex/init.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -580,7 +580,7 @@
KeCreateApplicationProcessorIdleThread(KeNumberProcessors);
/* Allocate a stack for use when booting the processor */ - ProcessorStack = RVA(Ki386InitialStackArray[((int)KeNumberProcessors)], MM_STACK_SIZE); + ProcessorStack = RVA(Ki386InitialStackArray[((int)KeNumberProcessors)], KERNEL_STACK_SIZE);
/* Tell HAL a new CPU is being started */ HalStartNextProcessor(0, (ULONG)ProcessorStack - 2*sizeof(FX_SAVE_AREA)); _____
Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c --- trunk/reactos/ntoskrnl/ke/i386/tss.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ke/i386/tss.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -119,7 +119,7 @@
Tss = ExAllocatePool(NonPagedPool, sizeof(KTSS)); TrapTss = ExAllocatePool(NonPagedPool, sizeof(KTSSNOIOPM)); - TrapStack = ExAllocatePool(NonPagedPool, MM_STACK_SIZE); + TrapStack = ExAllocatePool(NonPagedPool, KERNEL_STACK_SIZE);
Ki386TssArray[Id] = Tss; Ki386TrapTssArray[Id] = (KTSSNOIOPM*)TrapTss; @@ -127,7 +127,7 @@ KeGetCurrentKPCR()->TSS = Tss;
/* Initialize the boot TSS. */ - Tss->Esp0 = (ULONG)Ki386InitialStackArray[Id] + MM_STACK_SIZE; /* FIXME: - sizeof(FX_SAVE_AREA)? */ + Tss->Esp0 = (ULONG)Ki386InitialStackArray[Id] + KERNEL_STACK_SIZE; /* FIXME: - sizeof(FX_SAVE_AREA)? */ Tss->Ss0 = KGDT_R0_DATA; Tss->IoMapBase = 0xFFFF; /* No i/o bitmap */ Tss->LDT = 0; @@ -146,7 +146,7 @@
/* Initialize the TSS used for handling double faults. */ TrapTss->Flags = 0; - TrapTss->Esp0 = ((ULONG)TrapStack + MM_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ + TrapTss->Esp0 = ((ULONG)TrapStack + KERNEL_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ TrapTss->Ss0 = KGDT_R0_DATA; TrapTss->Cs = KGDT_R0_CODE; TrapTss->Eip = (ULONG)KiTrap8; _____
Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -853,8 +853,8 @@
Thread->Teb = Teb;
/* Set the Thread Stacks */ - Thread->InitialStack = (PCHAR)KernelStack + MM_STACK_SIZE; - Thread->StackBase = (PCHAR)KernelStack + MM_STACK_SIZE; + Thread->InitialStack = (PCHAR)KernelStack + KERNEL_STACK_SIZE; + Thread->StackBase = (PCHAR)KernelStack + KERNEL_STACK_SIZE; Thread->StackLimit = (ULONG_PTR)KernelStack; Thread->KernelStackResident = TRUE;
@@ -864,7 +864,7 @@ * while handling page faults. At this point it isn't possible to call the * page fault handler for the missing pde's. */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, MM_STACK_SIZE); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD));
/* Initalize the Thread Context */ _____
Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ke/process.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -60,7 +60,7 @@
* To prevent this, make sure the page directory of the process we're * attaching to is up-to-date. */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, MM_STACK_SIZE); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); }