diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /kernel/trace/trace_selftest.c | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'kernel/trace/trace_selftest.c')
| -rw-r--r-- | kernel/trace/trace_selftest.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index 00dd6485bdd7..d2cdbabb4ead 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c | |||
| @@ -288,6 +288,7 @@ trace_selftest_startup_function_graph(struct tracer *trace, | |||
| 288 | * to detect and recover from possible hangs | 288 | * to detect and recover from possible hangs |
| 289 | */ | 289 | */ |
| 290 | tracing_reset_online_cpus(tr); | 290 | tracing_reset_online_cpus(tr); |
| 291 | set_graph_array(tr); | ||
| 291 | ret = register_ftrace_graph(&trace_graph_return, | 292 | ret = register_ftrace_graph(&trace_graph_return, |
| 292 | &trace_graph_entry_watchdog); | 293 | &trace_graph_entry_watchdog); |
| 293 | if (ret) { | 294 | if (ret) { |