diff options
author | Stephane Eranian <eranian@google.com> | 2013-12-16 15:20:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:21:32 -0500 |
commit | 7fd565e27547c913b83b46d94662103be81a88ec (patch) | |
tree | 745cf346537493a2a28ea38b07cb34296cd1571e | |
parent | b283d2f3b74bc98174e8453c0be41dfcda3cae1b (diff) |
perf/x86: enable Haswell Celeron RAPL support
Enable RAPL support for Haswell Celeron (model 69).
Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: ak@linux.intel.com
Cc: acme@redhat.com
Cc: jolsa@redhat.com
Cc: zheng.z.yan@intel.com
Cc: bp@alien8.de
Cc: vincent.weaver@maine.edu
Cc: maria.n.dimakopoulou@gmail.com
Cc: peterz@infradead.org
Link: http://lkml.kernel.org/r/1387225224-27799-2-git-send-email-eranian@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_rapl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c index bf8e4a736d48..0e3754e450d9 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c | |||
@@ -615,6 +615,7 @@ static int __init rapl_pmu_init(void) | |||
615 | case 42: /* Sandy Bridge */ | 615 | case 42: /* Sandy Bridge */ |
616 | case 58: /* Ivy Bridge */ | 616 | case 58: /* Ivy Bridge */ |
617 | case 60: /* Haswell */ | 617 | case 60: /* Haswell */ |
618 | case 69: /* Haswell-Celeron */ | ||
618 | rapl_cntr_mask = RAPL_IDX_CLN; | 619 | rapl_cntr_mask = RAPL_IDX_CLN; |
619 | rapl_pmu_events_group.attrs = rapl_events_cln_attr; | 620 | rapl_pmu_events_group.attrs = rapl_events_cln_attr; |
620 | break; | 621 | break; |