X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.c;h=bfd0e8f7b38c79e68fd2971ea7600d91c025734f;hb=de2ae10743172075f2d527780bdfd890ccddb8e7;hp=16af0da88d81d68cce740adaace2b4672e21db8c;hpb=15999a03acd4083fb2618c92bebbc557813c5084;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c
index 16af0da8..bfd0e8f7 100644
--- a/Kernel/arch/x86/proc.c
+++ b/Kernel/arch/x86/proc.c
@@ -48,7 +48,7 @@ extern int	giNextTID;
 extern tThread	gThreadZero;
 extern tThread	*Threads_CloneTCB(Uint *Err, Uint Flags);
 extern void	Isr8(void);	// Double Fault
-extern void	Proc_ReturnToUser(void);
+extern void	Proc_ReturnToUser(tVAddr Handler, Uint Argument);
 
 // === PROTOTYPES ===
 void	ArchThreads_Init(void);
@@ -829,7 +829,7 @@ void Proc_CallFaultHandler(tThread *Thread)
 {
 	// Rewinds the stack and calls the user function
 	// Never returns
-	__asm__ __volatile__ ("mov %0, %%ebp;\n\tcall Proc_ReturnToUser" :: "r"(Thread->FaultHandler));
+	Proc_ReturnToUser( Thread->FaultHandler, Thread->CurFaultNum );
 	for(;;);
 }