git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
ptrace.c
diff --git
a/arch/x86/kernel/ptrace.c
b/arch/x86/kernel/ptrace.c
index
09ecbde
..
8d7d5c9
100644
(file)
--- a/
arch/x86/kernel/ptrace.c
+++ b/
arch/x86/kernel/ptrace.c
@@
-35,10
+35,11
@@
#include <asm/proto.h>
#include <asm/ds.h>
#include <asm/proto.h>
#include <asm/ds.h>
-#include <trace/syscall.h>
-
#include "tls.h"
#include "tls.h"
+#define CREATE_TRACE_POINTS
+#include <trace/events/syscalls.h>
+
enum x86_regset {
REGSET_GENERAL,
REGSET_FP,
enum x86_regset {
REGSET_GENERAL,
REGSET_FP,
@@
-1497,8
+1498,8
@@
asmregparm long syscall_trace_enter(struct pt_regs *regs)
tracehook_report_syscall_entry(regs))
ret = -1L;
tracehook_report_syscall_entry(regs))
ret = -1L;
- if (unlikely(test_thread_flag(TIF_SYSCALL_
FTRACE
)))
-
ftrace_syscall_enter(regs
);
+ if (unlikely(test_thread_flag(TIF_SYSCALL_
TRACEPOINT
)))
+
trace_sys_enter(regs, regs->orig_ax
);
if (unlikely(current->audit_context)) {
if (IS_IA32)
if (unlikely(current->audit_context)) {
if (IS_IA32)
@@
-1523,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(current->audit_context))
audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
- if (unlikely(test_thread_flag(TIF_SYSCALL_
FTRACE
)))
-
ftrace_syscall_exit(regs
);
+ 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);
if (test_thread_flag(TIF_SYSCALL_TRACE))
tracehook_report_syscall_exit(regs, 0);