Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core

Conflicts:
	include/linux/tracepoint.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 17 deletions

diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 9661dd406b9..5dc283ba5ae 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -8,23 +8,6 @@
 #include <asm/ptrace.h>
 
 
-extern void syscall_regfunc(void);
-extern void syscall_unregfunc(void);
-
-DECLARE_TRACE_WITH_CALLBACK(syscall_enter,
-        TP_PROTO(struct pt_regs *regs, long id),
-        TP_ARGS(regs, id),
-        syscall_regfunc,
-        syscall_unregfunc
-);
-
-DECLARE_TRACE_WITH_CALLBACK(syscall_exit,
-        TP_PROTO(struct pt_regs *regs, long ret),
-        TP_ARGS(regs, ret),
-        syscall_regfunc,
-        syscall_unregfunc
-);
-
 /*
  * A syscall entry in the ftrace syscalls array.
  *