X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farmv7%2Fproc.c;h=b5a867cfca71a3a8536fe38bebb247798fe5648b;hb=7aa331d83b8dd23d3ca7530fa582cec528df274a;hp=54951e1136c90cc0429c061d3e3075373254fb37;hpb=6c86cb7a9c4b01daadf3e8624845ab35b55ee73a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c
index 54951e11..b5a867cf 100644
--- a/Kernel/arch/armv7/proc.c
+++ b/Kernel/arch/armv7/proc.c
@@ -13,7 +13,7 @@
 extern tThread	gThreadZero;
 extern void	SwitchTask(Uint32 NewSP, Uint32 *OldSP, Uint32 NewIP, Uint32 *OldIP, Uint32 MemPtr);
 extern void	KernelThreadHeader(void);	// Actually takes args on stack
-extern void	Proc_int_DropToUser(Uint32 IP, Uint32 SP) NORETURN;
+extern void	Proc_int_DropToUser(Uint32 IP, Uint32 SP) NORETURN __attribute__((long_call));
 extern Uint32	Proc_int_SwapUserSP(Uint32 NewSP);
 extern Uint32	Proc_CloneInt(Uint32 *SP, Uint32 *MemPtr);
 extern tVAddr	MM_NewKStack(int bGlobal);	// TODO: Move out into a header
@@ -91,12 +91,7 @@ void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataS
 	
 	// Drop to user code
 	Log_Debug("Proc", "Proc_int_DropToUser(%p, %p)", Entrypoint, usr_sp);
-
-	// Needed to get around relocation truncation
-	{
-		void	(*drop)(Uint32, Uint32) NORETURN = Proc_int_DropToUser;
-		drop(Entrypoint, (Uint32)usr_sp);
-	}
+	Proc_int_DropToUser(Entrypoint, (Uint32)usr_sp);
 }
 
 void Proc_ClearThread(tThread *Thread)