Kernel/armv7 - Noted said hack as such

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

diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c
index 54951e1..c3cb226 100644 (file)
--- 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)
@@ -213,6 +208,7 @@ void Proc_Reschedule(void)
                next->SavedState.IP, next->SavedState.SP, next->MemState.Base,
                next->SavedState.UserSP
                );
+
        Log("Requested by %p", __builtin_return_address(0));
        
        gpCurrentThread = next;