tracing: Convert event tracing code to use NR_syscalls

Convert the syscalls event tracing code to use NR_syscalls, instead of
FTRACE_SYSCALL_MAX. NR_syscalls is standard accross most arches, and
reduces code confusion/complexity.

Signed-off-by: Jason Baron <jbaron@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Jiaying Zhang <jiayingz@google.com>
Cc: Martin Bligh <mbligh@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Josh Stone <jistone@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: H. Peter Anwin <hpa@zytor.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
LKML-Reference: <9b4f1a84ecae57cc6599412772efa36f0d2b815b.1251146513.git.jbaron@redhat.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 3cff1214e176a720e79bfd900345e8f8c591108e..9dbb527e1652e894bdd2119bf8b51a6979c78557 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -494,7 +494,7 @@ static struct syscall_metadata *find_syscall_meta(unsigned long *syscall)
 
 struct syscall_metadata *syscall_nr_to_meta(int nr)
 {
-       if (!syscalls_metadata || nr >= FTRACE_SYSCALL_MAX || nr < 0)
+       if (!syscalls_metadata || nr >= NR_syscalls || nr < 0)
                return NULL;
 
        return syscalls_metadata[nr];
@@ -507,7 +507,7 @@ int syscall_name_to_nr(char *name)
        if (!syscalls_metadata)
                return -1;
 
-       for (i = 0; i < FTRACE_SYSCALL_MAX; i++) {
+       for (i = 0; i < NR_syscalls; i++) {
                if (syscalls_metadata[i]) {
                        if (!strcmp(syscalls_metadata[i]->name, name))
                                return i;
@@ -533,13 +533,13 @@ static int __init arch_init_ftrace_syscalls(void)
        unsigned long **psys_syscall_table = &sys_call_table;
 
        syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) *
-                                       FTRACE_SYSCALL_MAX, GFP_KERNEL);
+                                       NR_syscalls, GFP_KERNEL);
        if (!syscalls_metadata) {
                WARN_ON(1);
                return -ENOMEM;
        }
 
-       for (i = 0; i < FTRACE_SYSCALL_MAX; i++) {
+       for (i = 0; i < NR_syscalls; i++) {
                meta = find_syscall_meta(psys_syscall_table[i]);
                syscalls_metadata[i] = meta;
        }

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index cb7f600cb02ac60645e9ea85f46a0c3e65f24b95..4f5fae6fad90ec2e176ad365d62d72212ec84088 100644 (file)
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -11,8 +11,8 @@
 static DEFINE_MUTEX(syscall_trace_lock);
 static int sys_refcount_enter;
 static int sys_refcount_exit;
-static DECLARE_BITMAP(enabled_enter_syscalls, FTRACE_SYSCALL_MAX);
-static DECLARE_BITMAP(enabled_exit_syscalls, FTRACE_SYSCALL_MAX);
+static DECLARE_BITMAP(enabled_enter_syscalls, NR_syscalls);
+static DECLARE_BITMAP(enabled_exit_syscalls, NR_syscalls);
 
 enum print_line_t
 print_syscall_enter(struct trace_iterator *iter, int flags)
@@ -289,7 +289,7 @@ int reg_event_syscall_enter(void *ptr)
 
        name = (char *)ptr;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
        mutex_lock(&syscall_trace_lock);
        if (!sys_refcount_enter)
@@ -312,7 +312,7 @@ void unreg_event_syscall_enter(void *ptr)
 
        name = (char *)ptr;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
        mutex_lock(&syscall_trace_lock);
        sys_refcount_enter--;
@@ -330,7 +330,7 @@ int reg_event_syscall_exit(void *ptr)
 
        name = (char *)ptr;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
        mutex_lock(&syscall_trace_lock);
        if (!sys_refcount_exit)
@@ -353,7 +353,7 @@ void unreg_event_syscall_exit(void *ptr)
 
        name = (char *)ptr;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
        mutex_lock(&syscall_trace_lock);
        sys_refcount_exit--;
@@ -373,8 +373,8 @@ struct trace_event event_syscall_exit = {
 
 #ifdef CONFIG_EVENT_PROFILE
 
-static DECLARE_BITMAP(enabled_prof_enter_syscalls, FTRACE_SYSCALL_MAX);
-static DECLARE_BITMAP(enabled_prof_exit_syscalls, FTRACE_SYSCALL_MAX);
+static DECLARE_BITMAP(enabled_prof_enter_syscalls, NR_syscalls);
+static DECLARE_BITMAP(enabled_prof_exit_syscalls, NR_syscalls);
 static int sys_prof_refcount_enter;
 static int sys_prof_refcount_exit;
 
@@ -420,7 +420,7 @@ int reg_prof_syscall_enter(char *name)
        int num;
 
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
 
        mutex_lock(&syscall_trace_lock);
@@ -442,7 +442,7 @@ void unreg_prof_syscall_enter(char *name)
        int num;
 
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
 
        mutex_lock(&syscall_trace_lock);
@@ -481,7 +481,7 @@ int reg_prof_syscall_exit(char *name)
        int num;
 
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
 
        mutex_lock(&syscall_trace_lock);
@@ -503,7 +503,7 @@ void unreg_prof_syscall_exit(char *name)
        int num;
 
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
 
        mutex_lock(&syscall_trace_lock);