From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932096AbbFDOLS (ORCPT ); Thu, 4 Jun 2015 10:11:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46924 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753706AbbFDOLO (ORCPT ); Thu, 4 Jun 2015 10:11:14 -0400 Date: Thu, 4 Jun 2015 07:10:58 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: namhyung@kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, acme@redhat.com Reply-To: dsahern@gmail.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, jolsa@redhat.com, hpa@zytor.com, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf machine: Fix the search for the kernel DSO on the unified list Git-Commit-ID: 0443f36b0de026143a78c858aac773572f7dd5db 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: 0443f36b0de026143a78c858aac773572f7dd5db Gitweb: http://git.kernel.org/tip/0443f36b0de026143a78c858aac773572f7dd5db Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 2 Jun 2015 11:28:13 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 2 Jun 2015 15:15:37 -0300 perf machine: Fix the search for the kernel DSO on the unified list When unifying the user_dsos and kernel_dsos a bug was introduced by inverting the check for dso->kernel, fix it. Fixes: 3d39ac538629 ("perf machine: No need to have two DSOs lists") Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/n/tip-xnrnq0kams3s2z9ek1wjb506@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 2ed61f5..4e29e80 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1149,7 +1149,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, struct dso *dso; list_for_each_entry(dso, &machine->dsos.head, node) { - if (dso->kernel && is_kernel_module(dso->long_name)) + if (!dso->kernel || is_kernel_module(dso->long_name)) continue; kernel = dso;