From e3eeb7b839afcf1bbe712195534700236f8d00af Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 24 Feb 2010 13:59:23 -0500 Subject: [PATCH] --- yaml --- r: 182301 b: refs/heads/master c: 86c38a31aa7f2dd6e74a262710bf8ebf7455acc5 h: refs/heads/master i: 182299: 0cfa37e4dab5f6a0576d68664faf851a861800fe v: v3 --- [refs] | 2 +- trunk/include/linux/syscalls.h | 6 ++++-- trunk/include/trace/ftrace.h | 3 ++- trunk/kernel/trace/trace.h | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd254e685d7c..968aac7c7abb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c54dd341fb701928b8e5dca91ced1870c55b05b +refs/heads/master: 86c38a31aa7f2dd6e74a262710bf8ebf7455acc5 diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h index 7b219696ad24..91bd7d78a07d 100644 --- a/trunk/include/linux/syscalls.h +++ b/trunk/include/linux/syscalls.h @@ -132,7 +132,8 @@ struct perf_event_attr; #define SYSCALL_TRACE_ENTER_EVENT(sname) \ static const struct syscall_metadata __syscall_meta_##sname; \ - static struct ftrace_event_call event_enter_##sname; \ + static struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_enter_##sname; \ static struct trace_event enter_syscall_print_##sname = { \ .trace = print_syscall_enter, \ }; \ @@ -153,7 +154,8 @@ struct perf_event_attr; #define SYSCALL_TRACE_EXIT_EVENT(sname) \ static const struct syscall_metadata __syscall_meta_##sname; \ - static struct ftrace_event_call event_exit_##sname; \ + static struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_exit_##sname; \ static struct trace_event exit_syscall_print_##sname = { \ .trace = print_syscall_exit, \ }; \ diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h index 09fd9afc0859..f23a0ca6910a 100644 --- a/trunk/include/trace/ftrace.h +++ b/trunk/include/trace/ftrace.h @@ -65,7 +65,8 @@ }; #undef DEFINE_EVENT #define DEFINE_EVENT(template, name, proto, args) \ - static struct ftrace_event_call event_##name + static struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_##name #undef DEFINE_EVENT_PRINT #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \ diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h index b477fce41edf..fd05bcaf91b0 100644 --- a/trunk/kernel/trace/trace.h +++ b/trunk/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))