X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86_64%2Fproc.c;h=2ee2d4a5849a50e3fd9652e59bde62c6170b9c36;hb=586a47ab9343a85c944a2cf7b27a74cf459a8423;hp=4d50210069a01f6392492541f51d208121e42ff2;hpb=dea6bcf35a3f52396724d74e47f71cb3afade37c;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/proc.c b/Kernel/arch/x86_64/proc.c
index 4d502100..2ee2d4a5 100644
--- a/Kernel/arch/x86_64/proc.c
+++ b/Kernel/arch/x86_64/proc.c
@@ -22,10 +22,10 @@
 
 // === IMPORTS ===
 extern tGDT	gGDT[];
-extern void APStartup(void);	// 16-bit AP startup code
+extern void	APStartup(void);	// 16-bit AP startup code
 extern Uint	GetRIP(void);	// start.asm
 extern Uint64	gInitialPML4[512];	// start.asm
-extern void	gInitialKernelStack;
+extern char	gInitialKernelStack[];
 extern tSpinlock	glThreadListLock;
 extern int	giNumCPUs;
 extern int	giNextTID;
@@ -39,7 +39,7 @@ extern tThread	*Threads_GetNextToRun(int CPU);
 extern void	Threads_Dump(void);
 extern tThread	*Threads_CloneTCB(Uint *Err, Uint Flags);
 extern void	Proc_ReturnToUser(void);
-extern void	GetCPUNum(void);
+extern int	GetCPUNum(void);
 
 // === PROTOTYPES ===
 void	ArchThreads_Init(void);
@@ -349,7 +349,6 @@ void Proc_Start(void)
 tThread *Proc_GetCurThread(void)
 {
 	#if USE_MP
-	//return gaCPUs[ gaAPIC_to_CPU[gpMP_LocalAPIC->ID.Val&0xFF] ].Current;
 	return gaCPUs[ GetCPUNum() ].Current;
 	#else
 	return gCurrentThread;