diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-04 19:02:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-04 19:02:53 +0100 |
| commit | 862b6f62bf0cd768910b087f6d051f420206c4d6 (patch) | |
| tree | f646e5246679ca851baf54e888c0d59b66ecf324 /kernel/trace/trace_export.c | |
| parent | 1ebdfa803dc5ced604ebadd26fcb8cdca8e09b85 (diff) | |
| parent | 3d56e331b6537671c66f1b510bed0f1e0331dfc8 (diff) | |
| download | talos-obmc-linux-862b6f62bf0cd768910b087f6d051f420206c4d6.tar.gz talos-obmc-linux-862b6f62bf0cd768910b087f6d051f420206c4d6.zip | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
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 4b74d71705c0..bbeec31e0ae3 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" |
