diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:48:28 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:48:28 +0900 |
| commit | 18e9550273b8a4d28044202f51cb2c3c9254d7c6 (patch) | |
| tree | a162ad088c712bd6dc35c7013cd30999731823c2 /kernel/trace/trace_export.c | |
| parent | 17292ecc07857bb16737c340dda289ab9d219e05 (diff) | |
| parent | d4f7e513234019a005c4d33477189f2a4e53bb9c (diff) | |
Merge branch 'sh/st-integration' into sh-latest
Diffstat (limited to 'kernel/trace/trace_export.c')
| -rw-r--r-- | kernel/trace/trace_export.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c index 4b74d71705c..bbeec31e0ae 100644 --- a/kernel/trace/trace_export.c +++ b/kernel/trace/trace_export.c @@ -161,13 +161,13 @@ struct ftrace_event_class event_class_ftrace_##call = { \ .fields = LIST_HEAD_INIT(event_class_ftrace_##call.fields),\ }; \ \ -struct ftrace_event_call __used \ -__attribute__((__aligned__(4))) \ -__attribute__((section("_ftrace_events"))) event_##call = { \ +struct ftrace_event_call __used event_##call = { \ .name = #call, \ .event.type = etype, \ .class = &event_class_ftrace_##call, \ .print_fmt = print, \ }; \ +struct ftrace_event_call __used \ +__attribute__((section("_ftrace_events"))) *__event_##call = &event_##call; #include "trace_entries.h" |