aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorJason Baron <jbaron@redhat.com>2009-08-24 17:40:22 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2009-08-26 15:30:02 -0400
commit57421dbbdc932d65f0e6a41ebb027a2bfe3d0669 (patch)
tree0dec1f947cc6d3e9d5fe813c31cbaa960c9ed7b6 /arch/x86/kernel
parenta5a2f8e2acb991327952c45a13f5441fc09dffd6 (diff)
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>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/ftrace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 3cff1214e176..9dbb527e1652 100644
--- 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)
494 494
495struct syscall_metadata *syscall_nr_to_meta(int nr) 495struct syscall_metadata *syscall_nr_to_meta(int nr)
496{ 496{
497 if (!syscalls_metadata || nr >= FTRACE_SYSCALL_MAX || nr < 0) 497 if (!syscalls_metadata || nr >= NR_syscalls || nr < 0)
498 return NULL; 498 return NULL;
499 499
500 return syscalls_metadata[nr]; 500 return syscalls_metadata[nr];
@@ -507,7 +507,7 @@ int syscall_name_to_nr(char *name)
507 if (!syscalls_metadata) 507 if (!syscalls_metadata)
508 return -1; 508 return -1;
509 509
510 for (i = 0; i < FTRACE_SYSCALL_MAX; i++) { 510 for (i = 0; i < NR_syscalls; i++) {
511 if (syscalls_metadata[i]) { 511 if (syscalls_metadata[i]) {
512 if (!strcmp(syscalls_metadata[i]->name, name)) 512 if (!strcmp(syscalls_metadata[i]->name, name))
513 return i; 513 return i;
@@ -533,13 +533,13 @@ static int __init arch_init_ftrace_syscalls(void)
533 unsigned long **psys_syscall_table = &sys_call_table; 533 unsigned long **psys_syscall_table = &sys_call_table;
534 534
535 syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) * 535 syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) *
536 FTRACE_SYSCALL_MAX, GFP_KERNEL); 536 NR_syscalls, GFP_KERNEL);
537 if (!syscalls_metadata) { 537 if (!syscalls_metadata) {
538 WARN_ON(1); 538 WARN_ON(1);
539 return -ENOMEM; 539 return -ENOMEM;
540 } 540 }
541 541
542 for (i = 0; i < FTRACE_SYSCALL_MAX; i++) { 542 for (i = 0; i < NR_syscalls; i++) {
543 meta = find_syscall_meta(psys_syscall_table[i]); 543 meta = find_syscall_meta(psys_syscall_table[i]);
544 syscalls_metadata[i] = meta; 544 syscalls_metadata[i] = meta;
545 } 545 }