tracing: Ftrace dynamic ftrace_event_call support

[pandora-kernel.git] / kernel / trace / trace_syscalls.c

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 46c1b97..5931933 100644 (file)
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -1,4 +1,5 @@
 #include <trace/syscall.h>
+#include <trace/events/syscalls.h>
 #include <linux/kernel.h>
 #include <linux/ftrace.h>
 #include <linux/perf_counter.h>
@@ -192,9 +193,10 @@ int syscall_enter_define_fields(struct ftrace_event_call *call)
                return ret;
 
        for (i = 0; i < meta->nb_args; i++) {
-               ret = trace_define_field(call, meta->types[i],
-                                        meta->args[i], offset,
-                                        sizeof(unsigned long), 0);
+               ret = trace_define_field(call, (char *)meta->types[i],
+                                        (char *)meta->args[i], offset,
+                                        sizeof(unsigned long), 0,
+                                        FILTER_OTHER);
                offset += sizeof(unsigned long);
        }
 
@@ -210,7 +212,8 @@ int syscall_exit_define_fields(struct ftrace_event_call *call)
        if (ret)
                return ret;
 
-       ret = trace_define_field(call, SYSCALL_FIELD(unsigned long, ret), 0);
+       ret = trace_define_field(call, SYSCALL_FIELD(unsigned long, ret), 0,
+                                FILTER_OTHER);
 
        return ret;
 }
@@ -274,19 +277,19 @@ void ftrace_syscall_exit(struct pt_regs *regs, long ret)
                trace_current_buffer_unlock_commit(event, 0, 0);
 }
 
-int reg_event_syscall_enter(void *ptr)
+int reg_event_syscall_enter(struct ftrace_event_call *call)
 {
        int ret = 0;
        int num;
        char *name;
 
-       name = (char *)ptr;
+       name = (char *)call->data;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= FTRACE_SYSCALL_MAX)
                return -ENOSYS;
        mutex_lock(&syscall_trace_lock);
        if (!sys_refcount_enter)
-               ret = register_trace_syscall_enter(ftrace_syscall_enter);
+               ret = register_trace_sys_enter(ftrace_syscall_enter);
        if (ret) {
                pr_info("event trace: Could not activate"
                                "syscall entry trace point");
@@ -298,12 +301,12 @@ int reg_event_syscall_enter(void *ptr)
        return ret;
 }
 
-void unreg_event_syscall_enter(void *ptr)
+void unreg_event_syscall_enter(struct ftrace_event_call *call)
 {
        int num;
        char *name;
 
-       name = (char *)ptr;
+       name = (char *)call->data;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= FTRACE_SYSCALL_MAX)
                return;
@@ -311,23 +314,23 @@ void unreg_event_syscall_enter(void *ptr)
        sys_refcount_enter--;
        clear_bit(num, enabled_enter_syscalls);
        if (!sys_refcount_enter)
-               unregister_trace_syscall_enter(ftrace_syscall_enter);
+               unregister_trace_sys_enter(ftrace_syscall_enter);
        mutex_unlock(&syscall_trace_lock);
 }
 
-int reg_event_syscall_exit(void *ptr)
+int reg_event_syscall_exit(struct ftrace_event_call *call)
 {
        int ret = 0;
        int num;
        char *name;
 
-       name = (char *)ptr;
+       name = (char *)call->data;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= FTRACE_SYSCALL_MAX)
                return -ENOSYS;
        mutex_lock(&syscall_trace_lock);
        if (!sys_refcount_exit)
-               ret = register_trace_syscall_exit(ftrace_syscall_exit);
+               ret = register_trace_sys_exit(ftrace_syscall_exit);
        if (ret) {
                pr_info("event trace: Could not activate"
                                "syscall exit trace point");
@@ -339,12 +342,12 @@ int reg_event_syscall_exit(void *ptr)
        return ret;
 }
 
-void unreg_event_syscall_exit(void *ptr)
+void unreg_event_syscall_exit(struct ftrace_event_call *call)
 {
        int num;
        char *name;
 
-       name = (char *)ptr;
+       name = (char *)call->data;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= FTRACE_SYSCALL_MAX)
                return;
@@ -352,7 +355,7 @@ void unreg_event_syscall_exit(void *ptr)
        sys_refcount_exit--;
        clear_bit(num, enabled_exit_syscalls);
        if (!sys_refcount_exit)
-               unregister_trace_syscall_exit(ftrace_syscall_exit);
+               unregister_trace_sys_exit(ftrace_syscall_exit);
        mutex_unlock(&syscall_trace_lock);
 }
 
@@ -418,7 +421,7 @@ int reg_prof_syscall_enter(char *name)
 
        mutex_lock(&syscall_trace_lock);
        if (!sys_prof_refcount_enter)
-               ret = register_trace_syscall_enter(prof_syscall_enter);
+               ret = register_trace_sys_enter(prof_syscall_enter);
        if (ret) {
                pr_info("event trace: Could not activate"
                                "syscall entry trace point");
@@ -442,7 +445,7 @@ void unreg_prof_syscall_enter(char *name)
        sys_prof_refcount_enter--;
        clear_bit(num, enabled_prof_enter_syscalls);
        if (!sys_prof_refcount_enter)
-               unregister_trace_syscall_enter(prof_syscall_enter);
+               unregister_trace_sys_enter(prof_syscall_enter);
        mutex_unlock(&syscall_trace_lock);
 }
 
@@ -479,7 +482,7 @@ int reg_prof_syscall_exit(char *name)
 
        mutex_lock(&syscall_trace_lock);
        if (!sys_prof_refcount_exit)
-               ret = register_trace_syscall_exit(prof_syscall_exit);
+               ret = register_trace_sys_exit(prof_syscall_exit);
        if (ret) {
                pr_info("event trace: Could not activate"
                                "syscall entry trace point");
@@ -503,7 +506,7 @@ void unreg_prof_syscall_exit(char *name)
        sys_prof_refcount_exit--;
        clear_bit(num, enabled_prof_exit_syscalls);
        if (!sys_prof_refcount_exit)
-               unregister_trace_syscall_exit(prof_syscall_exit);
+               unregister_trace_sys_exit(prof_syscall_exit);
        mutex_unlock(&syscall_trace_lock);
 }