ARM: 7688/1: add support for context tracking subsystem

[cascardo/linux.git] / arch / arm / kernel / entry-common.S

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 3248cde..469e82b 100644 (file)
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -41,6 +41,7 @@ ret_fast_syscall:
 
        /* perform architecture specific actions before user return */
        arch_ret_to_user r1, lr
+       ct_user_enter
 
        restore_user_regs fast = 1, offset = S_OFF
  UNWIND(.fnend         )
@@ -76,6 +77,7 @@ no_work_pending:
 #endif
        /* perform architecture specific actions before user return */
        arch_ret_to_user r1, lr
+       ct_user_enter save = 0
 
        restore_user_regs fast = 0, offset = 0
 ENDPROC(ret_to_user_from_irq)
@@ -394,6 +396,7 @@ ENTRY(vector_swi)
        mcr     p15, 0, ip, c1, c0              @ update control register
 #endif
        enable_irq
+       ct_user_exit
 
        get_thread_info tsk
        adr     tbl, sys_call_table             @ load syscall table pointer