diff options
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
| -rw-r--r-- | arch/x86/include/asm/thread_info.h | 13 | 
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index fad7d40b75f..6f7786aea4f 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -95,7 +95,7 @@ struct thread_info {  #define TIF_DEBUGCTLMSR		25	/* uses thread_struct.debugctlmsr */  #define TIF_DS_AREA_MSR		26      /* uses thread_struct.ds_area_msr */  #define TIF_LAZY_MMU_UPDATES	27	/* task is updating the mmu lazily */ -#define TIF_SYSCALL_FTRACE	28	/* for ftrace syscall instrumentation */ +#define TIF_SYSCALL_TRACEPOINT	28	/* syscall tracepoint instrumentation */  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)  #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME) @@ -118,17 +118,17 @@ struct thread_info {  #define _TIF_DEBUGCTLMSR	(1 << TIF_DEBUGCTLMSR)  #define _TIF_DS_AREA_MSR	(1 << TIF_DS_AREA_MSR)  #define _TIF_LAZY_MMU_UPDATES	(1 << TIF_LAZY_MMU_UPDATES) -#define _TIF_SYSCALL_FTRACE	(1 << TIF_SYSCALL_FTRACE) +#define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)  /* work to do in syscall_trace_enter() */  #define _TIF_WORK_SYSCALL_ENTRY	\ -	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_FTRACE |	\ -	 _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP) +	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT |	\ +	 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT)  /* work to do in syscall_trace_leave() */  #define _TIF_WORK_SYSCALL_EXIT	\  	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP |	\ -	 _TIF_SYSCALL_FTRACE) +	 _TIF_SYSCALL_TRACEPOINT)  /* work to do on interrupt/exception return */  #define _TIF_WORK_MASK							\ @@ -137,7 +137,8 @@ struct thread_info {  	   _TIF_SINGLESTEP|_TIF_SECCOMP|_TIF_SYSCALL_EMU))  /* work to do on any return to user space */ -#define _TIF_ALLWORK_MASK ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_FTRACE) +#define _TIF_ALLWORK_MASK						\ +	((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT)  /* Only used for 64 bit */  #define _TIF_DO_NOTIFY_MASK						\  |