---

yaml --- r: 158459 b: refs/heads/master c: 3d27d8c h: refs/heads/master i: 158457: e65fb2f 158455: 546be81 v: v3
git-mirror · Aug 25, 2009 · 18602ad · 18602ad
1 parent 800be90
commit 18602ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 667000011927b4fcc359beac4a2447889db6d349
+refs/heads/master: 3d27d8cb34fc156beb86de2338ca4029873a5cc6
diff --git a/trunk/include/trace/syscall.h b/trunk/include/trace/syscall.h
@@ -8,6 +8,8 @@
 #include <asm/ptrace.h>
 
 
+#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
+
 extern void syscall_regfunc(void);
 extern void syscall_unregfunc(void);
 
@@ -25,6 +27,8 @@ DECLARE_TRACE_WITH_CALLBACK(syscall_exit,
 	syscall_unregfunc
 );
 
+#endif
+
 /*
  * A syscall entry in the ftrace syscalls array.
  *

diff --git a/trunk/kernel/tracepoint.c b/trunk/kernel/tracepoint.c
@@ -576,7 +576,7 @@ __initcall(init_tracepoints);
 
 #endif /* CONFIG_MODULES */
 
-#ifdef CONFIG_FTRACE_SYSCALLS
+#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
 
 static DEFINE_MUTEX(regfunc_mutex);
 static int sys_tracepoint_refcount;