From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753380AbbCAQu6 (ORCPT ); Sun, 1 Mar 2015 11:50:58 -0500 Received: from terminus.zytor.com ([198.137.202.10]:60258 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751985AbbCAQuw (ORCPT ); Sun, 1 Mar 2015 11:50:52 -0500 Date: Sun, 1 Mar 2015 08:50:38 -0800 From: tip-bot for David Ahern Message-ID: Cc: linux-kernel@vger.kernel.org, david.ahern@oracle.com, acme@redhat.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, david.ahern@oracle.com, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1424304198-92028-1-git-send-email-david.ahern@oracle.com> References: <1424304198-92028-1-git-send-email-david.ahern@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf top: Fix SIGBUS on sparc64 Git-Commit-ID: a73b6c199a663d64a38198f547d5c5be42163193 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a73b6c199a663d64a38198f547d5c5be42163193 Gitweb: http://git.kernel.org/tip/a73b6c199a663d64a38198f547d5c5be42163193 Author: David Ahern AuthorDate: Wed, 18 Feb 2015 19:03:18 -0500 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 25 Feb 2015 17:37:44 -0300 perf top: Fix SIGBUS on sparc64 perf-top is terminating due to SIGBUS on sparc64. git bisect points to: commit 82396986032915c1572bfb74b224fcc2e4e8ba7c Author: Arnaldo Carvalho de Melo Date: Mon Sep 8 13:26:35 2014 -0300 perf evlist: Refcount mmaps We need to know how many fds are using a perf mmap via PERF_EVENT_IOC_SET_OUTPUT, so that we can know when to ditch an mmap, refcount it. This commit added 'int refcnt' to struct perf_mmap and the addition makes the event_copy element no longer 8-byte aligned. Fix by adding __attribute__((aligned(8))) to the event_copy struct member. Signed-off-by: David Ahern Link: http://lkml.kernel.org/r/1424304198-92028-1-git-send-email-david.ahern@oracle.com [ Switched from 'int pad;' to using __attribute__, David tested/acked that ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index c94a9e0..e99a676 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -28,7 +28,7 @@ struct perf_mmap { int mask; int refcnt; unsigned int prev; - char event_copy[PERF_SAMPLE_MAX_SIZE]; + char event_copy[PERF_SAMPLE_MAX_SIZE] __attribute__((aligned(8))); }; struct perf_evlist {