lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tracing/urgent' into tracing/ftrace

Browse Source
This commit is contained in:
Ingo Molnar
2009-04-07 14:41:14 +02:00
parent 93776a8ec7 1bbe2a83ab
commit 86665c75da
12 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/trace.h
View File

@ -602,7 +602,7 @@ extern int trace_selftest_startup_branch(struct tracer *trace,
#endif /* CONFIG_FTRACE_STARTUP_TEST */
extern void *head_page(struct trace_array_cpu *data);
extern long ns2usecs(cycle_t nsec);
extern unsigned long long ns2usecs(cycle_t nsec);
extern int
trace_vbprintk(unsigned long ip, const char *fmt, va_list args);
extern int