[tip:perfcounters/core] perf_counter: Fix ftrace events raw samples to be aligned to 8 bytes
From: tip-bot for Frederic Weisbecker
Date: Sat Aug 08 2009 - 07:54:39 EST
Commit-ID: eba67b1fd06180d57b94bf97557d89873b0ce61e
Gitweb: http://git.kernel.org/tip/eba67b1fd06180d57b94bf97557d89873b0ce61e
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
AuthorDate: Sat, 8 Aug 2009 04:26:39 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sat, 8 Aug 2009 13:49:23 +0200
perf_counter: Fix ftrace events raw samples to be aligned to 8 bytes
Align the ftrace events raw samples to 8 bytes so that they
meet the perf output event alignment requirements.
Reported-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
LKML-Reference: <1249698400-5441-6-git-send-email-fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
include/trace/ftrace.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index bbf9042..7fb16d9 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -685,7 +685,7 @@ static void ftrace_profile_##call(proto) \
pc = preempt_count(); \
\
__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
- __entry_size = __data_size + sizeof(*entry); \
+ __entry_size = ALIGN(__data_size + sizeof(*entry), sizeof(u64));\
\
do { \
char raw_data[__entry_size]; \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/