Darn defaulting to 32-bit integers :(

[tpg/acess2.git] / Kernel / arch / x86 / proc.c

diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c
index e988416..45c5a56 100644 (file)
--- a/Kernel/arch/x86/proc.c
+++ b/Kernel/arch/x86/proc.c
@@ -26,7 +26,7 @@ extern void APStartup();      // 16-bit AP startup code
 extern Uint    GetEIP();       // start.asm
 extern Uint32  gaInitPageDir[1024];    // start.asm
 extern void    Kernel_Stack_Top;
-extern volatile int    giThreadListLock;
+extern tSpinlock       glThreadListLock;
 extern int     giNumCPUs;
 extern int     giNextTID;
 extern int     giTotalTickets;
@@ -39,7 +39,7 @@ extern tThread        *Threads_GetNextToRun(int CPU);
 extern void    Threads_Dump();
 extern tThread *Threads_CloneTCB(Uint *Err, Uint Flags);
 extern void    Isr8(); // Double Fault
-extern void    Proc_AlterUserReturnAddr();
+extern void    Proc_ReturnToUser();
 
 // === PROTOTYPES ===
 void   ArchThreads_Init();
@@ -703,7 +703,7 @@ void Proc_CallFaultHandler(tThread *Thread)
 {
        // Rewinds the stack and calls the user function
        // Never returns
-       __asm__ __volatile__ ("mov %0, %%ebp;\n\tcall Proc_AlterUserReturnAddr" :: "r"(Thread->FaultHandler));
+       __asm__ __volatile__ ("mov %0, %%ebp;\n\tcall Proc_ReturnToUser" :: "r"(Thread->FaultHandler));
        for(;;);
 }
 
@@ -717,7 +717,7 @@ void Proc_Scheduler(int CPU)
        tThread *thread;
        
        // If the spinlock is set, let it complete
-       if(giThreadListLock)    return;
+       if(IS_LOCKED(&glThreadListLock))        return;
        
        // Clear Delete Queue
        while(gDeleteThreads)