From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757750AbZHHC1L (ORCPT ); Fri, 7 Aug 2009 22:27:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757699AbZHHC1I (ORCPT ); Fri, 7 Aug 2009 22:27:08 -0400 Received: from fg-out-1718.google.com ([72.14.220.157]:26774 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756847AbZHHC0r (ORCPT ); Fri, 7 Aug 2009 22:26:47 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Trv8cqVSC/1juEbr4Ihu69GbaR+8EV5JMR13ID3dSDzpOVYcZNraxn80VQ2Khbk3HJ dIG4W0WNeW8JPEhh5peWR6jH+PLcrQjBfrFc9vqm3Fy0ttppNBGn+XfECFWIDCsgi3Fg J4d0MyB9hd+dHK2qUHLkjGllGg03jrS+N4CB4= From: Frederic Weisbecker To: Ingo Molnar Cc: LKML , Frederic Weisbecker , Peter Zijlstra , Arnaldo Carvalho de Melo , Mike Galbraith , Paul Mackerras Subject: [PATCH 3/3] perfcounter: Align ftrace events raw samples to 8 bytes Date: Sat, 8 Aug 2009 04:26:39 +0200 Message-Id: <1249698400-5441-6-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1249698400-5441-1-git-send-email-fweisbec@gmail.com> References: <1249698400-5441-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Align the ftrace events raw samples to 8 bytes so that they meet the perf output event alignements requirements. Reported-by: Peter Zijlstra Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Mike Galbraith Cc: Paul Mackerras --- 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 80e5f6c..7b0834c 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -687,7 +687,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]; \ -- 1.6.2.3