From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754085AbdDKIEz (ORCPT ); Tue, 11 Apr 2017 04:04:55 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47635 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752579AbdDKIDx (ORCPT ); Tue, 11 Apr 2017 04:03:53 -0400 Date: Tue, 11 Apr 2017 00:57:06 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, jolsa@redhat.com, eranian@google.com, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, vincent.weaver@maine.edu, Suravee.Suthikulpanit@amd.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, bp@suse.de, mingo@kernel.org Reply-To: eranian@google.com, jolsa@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org, mingo@kernel.org, bp@suse.de, alexander.shishkin@linux.intel.com, acme@redhat.com, vincent.weaver@maine.edu, Suravee.Suthikulpanit@amd.com In-Reply-To: <20170410122047.3026-2-bp@alien8.de> References: <20170410122047.3026-2-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/amd/uncore: Do feature check first, before assignments Git-Commit-ID: c2628f90c9964881a62dd8e9f7372ca05cb6fe32 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: c2628f90c9964881a62dd8e9f7372ca05cb6fe32 Gitweb: http://git.kernel.org/tip/c2628f90c9964881a62dd8e9f7372ca05cb6fe32 Author: Borislav Petkov AuthorDate: Mon, 10 Apr 2017 14:20:45 +0200 Committer: Ingo Molnar CommitDate: Tue, 11 Apr 2017 08:44:59 +0200 perf/amd/uncore: Do feature check first, before assignments ... and save some unnecessary work. Remove now unused label while at it. Signed-off-by: Borislav Petkov Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Suravee Suthikulpanit Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/20170410122047.3026-2-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/amd/uncore.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c index 4d1f7f2d..abd4b90 100644 --- a/arch/x86/events/amd/uncore.c +++ b/arch/x86/events/amd/uncore.c @@ -509,7 +509,10 @@ static int __init amd_uncore_init(void) int ret = -ENODEV; if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) - goto fail_nodev; + return -ENODEV; + + if (!boot_cpu_has(X86_FEATURE_TOPOEXT)) + return -ENODEV; switch(boot_cpu_data.x86) { case 23: @@ -552,9 +555,6 @@ static int __init amd_uncore_init(void) amd_nb_pmu.attr_groups = amd_uncore_attr_groups_df; amd_llc_pmu.attr_groups = amd_uncore_attr_groups_l3; - if (!boot_cpu_has(X86_FEATURE_TOPOEXT)) - goto fail_nodev; - if (boot_cpu_has(X86_FEATURE_PERFCTR_NB)) { amd_uncore_nb = alloc_percpu(struct amd_uncore *); if (!amd_uncore_nb) { @@ -615,7 +615,6 @@ fail_nb: if (amd_uncore_nb) free_percpu(amd_uncore_nb); -fail_nodev: return ret; } device_initcall(amd_uncore_init);