diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:20:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:20:17 +0100 |
| commit | 281b3714e91162b66add1cfac404cf7b81e3e2f2 (patch) | |
| tree | 9f80453153db272c207129d971e17d31a6bb214a /kernel/trace/trace.h | |
| parent | Merge commit 'v2.6.33' into tracing/core (diff) | |
| parent | tracing: Simplify memory recycle of trace_define_field (diff) | |
| download | linux-281b3714e91162b66add1cfac404cf7b81e3e2f2.tar.xz linux-281b3714e91162b66add1cfac404cf7b81e3e2f2.zip | |
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index b477fce41edf..fd05bcaf91b0 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -792,7 +792,8 @@ extern const char *__stop___trace_bprintk_fmt[]; #undef FTRACE_ENTRY #define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \ - extern struct ftrace_event_call event_##call; + extern struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_##call; #undef FTRACE_ENTRY_DUP #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \ FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print)) |