summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-17 10:37:37 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-17 10:37:37 +0100
commit4176935b58eeb636917e65a2c388e4607e36cce6 (patch)
treedac4e0005cda5a3a5a313dde35bbac2877d9bd93 /kernel/trace/trace.h
parentc269fc8c537d761f36cb98e637ae934d9331a9d5 (diff)
parent6adaad14d7d4d3ef31b4e2dc992b18b5da7c4eb3 (diff)
downloadop-kernel-dev-4176935b58eeb636917e65a2c388e4607e36cce6.zip
op-kernel-dev-4176935b58eeb636917e65a2c388e4607e36cce6.tar.gz
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index f561628..546bcbd 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -564,7 +564,7 @@ struct tracer_switch_ops {
};
#endif /* CONFIG_CONTEXT_SWITCH_TRACER */
-extern char *trace_find_cmdline(int pid);
+extern void trace_find_cmdline(int pid, char comm[]);
#ifdef CONFIG_DYNAMIC_FTRACE
extern unsigned long ftrace_update_tot_cnt;
OpenPOWER on IntegriCloud