diff options
Diffstat (limited to 'arch/x86/kernel/ptrace.c')
| -rw-r--r-- | arch/x86/kernel/ptrace.c | 16 | 
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 34dd6f15185..8d7d5c9c1be 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -35,13 +35,11 @@  #include <asm/proto.h>  #include <asm/ds.h> -#include <trace/syscall.h> - -DEFINE_TRACE(syscall_enter); -DEFINE_TRACE(syscall_exit); -  #include "tls.h" +#define CREATE_TRACE_POINTS +#include <trace/events/syscalls.h> +  enum x86_regset {  	REGSET_GENERAL,  	REGSET_FP, @@ -1500,8 +1498,8 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)  	    tracehook_report_syscall_entry(regs))  		ret = -1L; -	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE))) -		trace_syscall_enter(regs, regs->orig_ax); +	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) +		trace_sys_enter(regs, regs->orig_ax);  	if (unlikely(current->audit_context)) {  		if (IS_IA32) @@ -1526,8 +1524,8 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs)  	if (unlikely(current->audit_context))  		audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); -	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE))) -		trace_syscall_exit(regs, regs->ax); +	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) +		trace_sys_exit(regs, regs->ax);  	if (test_thread_flag(TIF_SYSCALL_TRACE))  		tracehook_report_syscall_exit(regs, 0);  |