diff --git a/[refs] b/[refs] index aa7e4f5f8c15..7c96c6566579 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e302cf3f961ceb54c1dd0aff7ba8531df83be07a +refs/heads/master: f7d48cbde5c0710008caeaf7dbf14f4a9b064940 diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h index 05fa804d1c16..a8b624ccd4d6 100644 --- a/trunk/kernel/trace/trace.h +++ b/trunk/kernel/trace/trace.h @@ -469,10 +469,10 @@ struct tracer_switch_ops { void *private; struct tracer_switch_ops *next; }; - -char *trace_find_cmdline(int pid); #endif /* CONFIG_CONTEXT_SWITCH_TRACER */ +extern char *trace_find_cmdline(int pid); + #ifdef CONFIG_DYNAMIC_FTRACE extern unsigned long ftrace_update_tot_cnt; #define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func