Commit-ID:  4d120c535d638a952e644817ba3cbef30deedb2b
Gitweb:     http://git.kernel.org/tip/4d120c535d638a952e644817ba3cbef30deedb2b
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Mon, 22 Feb 2016 22:19:20 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 29 Feb 2016 09:35:21 +0100

perf/x86/intel/rapl: Make Knights Landings support functional

The Knights Landings support added the events and the detection case, but then
returns 0 without actually initializing the driver.

Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Dasaratharaman Chandramouli <[email protected]>
Cc: Harish Chegondi <[email protected]>
Cc: Jacob Pan <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Kan Liang <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Vince Weaver <[email protected]>
Cc: [email protected]
Fixes: 3a2a7797326a4 "perf/x86/intel/rapl: Add support for Knights Landing 
(KNL)"
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 arch/x86/events/intel/rapl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 580f504..536f0ce 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -731,7 +731,7 @@ static int __init rapl_pmu_init(void)
                rapl_add_quirk(rapl_hsw_server_quirk);
                rapl_cntr_mask = RAPL_IDX_KNL;
                rapl_pmu_events_group.attrs = rapl_events_knl_attr;
-
+               break;
        default:
                /* unsupported */
                return 0;

Reply via email to