diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:30:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:30:52 +0100 |
| commit | d2e82546ae98eee353fae57e389f487586fe380d (patch) | |
| tree | 887c0885760763d2e6710f418108ec322fb492fd /kernel/trace/trace.h | |
| parent | Merge commit 'v2.6.29-rc8' into tracing/ftrace (diff) | |
| parent | softirq: no need to have SOFTIRQ in softirq name (diff) | |
| download | linux-d2e82546ae98eee353fae57e389f487586fe380d.tar.xz linux-d2e82546ae98eee353fae57e389f487586fe380d.zip | |
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.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 35cfa7bbaf38..67595b8f0f15 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -776,6 +776,11 @@ extern struct ftrace_event_call __stop_ftrace_events[]; extern const char *__start___trace_bprintk_fmt[]; extern const char *__stop___trace_bprintk_fmt[]; +/* + * The double __builtin_constant_p is because gcc will give us an error + * if we try to allocate the static variable to fmt if it is not a + * constant. Even with the outer if statement optimizing out. + */ #define event_trace_printk(ip, fmt, args...) \ do { \ __trace_printk_check_format(fmt, ##args); \ |