summaryrefslogtreecommitdiff
path: root/include/trace
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2010-02-24 13:59:23 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-12 14:57:14 -0700
commit8faa545b70aa50bcb01a7baa113341ba1dff2fc3 (patch)
treefd760f59ac352e235b406e4d59503c079ed8345b /include/trace
parent0b7817edda5e44e5fa769645bd1220f5e7b0beb5 (diff)
tracing: Fix ftrace_event_call alignment for use with gcc 4.5
commit 86c38a31aa7f2dd6e74a262710bf8ebf7455acc5 upstream. GCC 4.5 introduces behavior that forces the alignment of structures to use the largest possible value. The default value is 32 bytes, so if some structures are defined with a 4-byte alignment and others aren't declared with an alignment constraint at all - it will align at 32-bytes. For things like the ftrace events, this results in a non-standard array. When initializing the ftrace subsystem, we traverse the _ftrace_events section and call the initialization callback for each event. When the structures are misaligned, we could be treating another part of the structure (or the zeroed out space between them) as a function pointer. This patch forces the alignment for all the ftrace_event_call structures to 4 bytes. Without this patch, the kernel fails to boot very early when built with gcc 4.5. It's trivial to check the alignment of the members of the array, so it might be worthwhile to add something to the build system to do that automatically. Unfortunately, that only covers this case. I've asked one of the gcc developers about adding a warning when this condition is seen. Cc: stable@kernel.org Signed-off-by: Jeff Mahoney <jeffm@suse.com> LKML-Reference: <4B85770B.6010901@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Cc: Andreas Radke <a.radke@arcor.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/ftrace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index dacb8ef67000..4b6a4a300167 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -43,7 +43,8 @@
tstruct \
char __data[0]; \
}; \
- static struct ftrace_event_call event_##name
+ static struct ftrace_event_call \
+ __attribute__((__aligned__(4))) event_##name
#undef __cpparg
#define __cpparg(arg...) arg