From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754366AbcIDSCo (ORCPT ); Sun, 4 Sep 2016 14:02:44 -0400 Received: from mout.web.de ([217.72.192.78]:65018 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753253AbcIDSCl (ORCPT ); Sun, 4 Sep 2016 14:02:41 -0400 Subject: [PATCH 4/4] perf/x86/cqm: Rename jump labels in intel_cqm_init() To: x86@kernel.org, Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Peter Zijlstra , Richard Cochran , Stephane Eranian , Thomas Gleixner , Tony Luck , Vikas Shivappa References: <566ABCD9.1060404@users.sourceforge.net> <9d893198-dd12-14a8-74bd-02fc42de4bf4@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: <12037a23-1511-f0ae-a07c-2ffd6650f5e1@users.sourceforge.net> Date: Sun, 4 Sep 2016 20:00:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <9d893198-dd12-14a8-74bd-02fc42de4bf4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:2P6ectIP/Fx7ChC/K4Tmv9VsF2K11GZfbcMFhVgwbQmCHWFhgxb +bFj7kE3mAGE9vDJDXeZTW3sjIhnrRvjdSSHYhbsWP/NHmdsx2Tyh1QEiYXJRTRjlkMLnxQ BZ7IzJ11yCECDI+aHJrNsOW3BpmfgJDWVTsgcn0aYHa7wFah5tDUj8kqIh43mDLF9w9/7dN eKIxNlZ+LhG/x0Qb9TmQw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Wm0EGpzcDMM=:uoaL11WladPYWdCxm3W2VV LpAfRqrfHn3ZKqGQhXcVPvc0vQd/J7QWcWeNopzJEaudPH9ZLUbdd7Uc82O32CzJe0CXwg13x ODAkJ+rEfEeEu6WwM8iq6/9Nh1WbvCjzjEjIX6oPcNcFDfNmyI8/h6zMLlelG0VyoWMZNhRnz auyOF3b3MG/wnccvhkWQOG5lJBmjBqjC7dbBHlz1N6OjXnFOmP1Ff35h2Svxy4mINtez29Ild nCu5WcBe55A4RhHmmiGR5LZUFjJe/3S5KXNo93uaKuzY8QUiV95qz9C1Fic4VE09Ui+Jyfjj5 4s53FjZPpCkiprqeoTL6cWE1bxkRVe/Z/8v/ujb47lFOdt3xOLf+ngIDnM2uXVNv/boGMeHG8 8FuUAYQFe7A4TYx0U8pYMEt4khqSC5LTn37ko08vBYW6oZbzS1ruNm9sv8VW3y8by4EUYmKtn ALfCgnaZDHh+Tg9ulVop8wAGYngoVf7fVmsc+ttb31jn3Yei5VAkyShWhepwL/wFg3JaH5hiq nD7AcTquU8d3encS6vS2BgsCI6gCYykFWtRSbcceUhoA7WbzzssUZOUdTLOyKBdMUAdxubsit CuocSZ1RHeWb3eaDmMRNXTj5tfoustoBmzKAW58h0h8lqggH6TsABGSQGMSmqjnRfkTy6jUgT LXjltPAkhxDhc7v6yLyoqX8/0lgqINeiDDBQUq1WKWc8X2OBhwhJO9taV9Kj5bIiUGHsPk2Pz NEozz/IhINae982US1ZfFq54/vKm46noZ7NxckWy3t7GOFSzZ4a5i8iEIdMj1cJT5MIkcLjZy RID5OfF Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 4 Sep 2016 19:23:57 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- arch/x86/events/intel/cqm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c index 304caf53..6cf508a 100644 --- a/arch/x86/events/intel/cqm.c +++ b/arch/x86/events/intel/cqm.c @@ -1701,7 +1701,7 @@ static int __init intel_cqm_init(void) if (c->x86_cache_occ_scale != cqm_l3_scale) { pr_err("Multiple LLC scale values, disabling\n"); ret = -EINVAL; - goto out; + goto put_cpus; } } @@ -1719,19 +1719,19 @@ static int __init intel_cqm_init(void) str = kstrdup(scale, GFP_KERNEL); if (!str) { ret = -ENOMEM; - goto out; + goto put_cpus; } event_attr_intel_cqm_llc_scale.event_str = str; ret = intel_cqm_setup_rmid_cache(); if (ret) - goto out; + goto put_cpus; if (mbm_enabled) ret = intel_mbm_init(); if (ret && !cqm_enabled) - goto out; + goto put_cpus; if (cqm_enabled && mbm_enabled) intel_cqm_events_group.attrs = intel_cmt_mbm_events_attr; @@ -1743,7 +1743,7 @@ static int __init intel_cqm_init(void) ret = perf_pmu_register(&intel_cqm_pmu, "intel_cqm", -1); if (ret) { pr_err("Intel CQM perf registration failed: %d\n", ret); - goto out; + goto put_cpus; } if (cqm_enabled) @@ -1760,8 +1760,7 @@ static int __init intel_cqm_init(void) intel_cqm_cpu_starting, NULL); cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_ONLINE, "AP_PERF_X86_CQM_ONLINE", NULL, intel_cqm_cpu_exit); - -out: + put_cpus: put_online_cpus(); if (ret) { -- 2.9.3