diff options
-rw-r--r-- | arch/x86/kernel/cpu/perf_counter.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c index 93af821ebe51..56001feeffcd 100644 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/arch/x86/kernel/cpu/perf_counter.c | |||
@@ -1409,23 +1409,20 @@ static int intel_pmu_init(void) | |||
1409 | switch (boot_cpu_data.x86_model) { | 1409 | switch (boot_cpu_data.x86_model) { |
1410 | case 17: | 1410 | case 17: |
1411 | memcpy(hw_cache_event_ids, core2_hw_cache_event_ids, | 1411 | memcpy(hw_cache_event_ids, core2_hw_cache_event_ids, |
1412 | sizeof(u64)*PERF_COUNT_HW_CACHE_MAX* | 1412 | sizeof(hw_cache_event_ids)); |
1413 | PERF_COUNT_HW_CACHE_OP_MAX*PERF_COUNT_HW_CACHE_RESULT_MAX); | ||
1414 | 1413 | ||
1415 | pr_cont("Core2 events, "); | 1414 | pr_cont("Core2 events, "); |
1416 | break; | 1415 | break; |
1417 | default: | 1416 | default: |
1418 | case 26: | 1417 | case 26: |
1419 | memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids, | 1418 | memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids, |
1420 | sizeof(u64)*PERF_COUNT_HW_CACHE_MAX* | 1419 | sizeof(hw_cache_event_ids)); |
1421 | PERF_COUNT_HW_CACHE_OP_MAX*PERF_COUNT_HW_CACHE_RESULT_MAX); | ||
1422 | 1420 | ||
1423 | pr_cont("Nehalem/Corei7 events, "); | 1421 | pr_cont("Nehalem/Corei7 events, "); |
1424 | break; | 1422 | break; |
1425 | case 28: | 1423 | case 28: |
1426 | memcpy(hw_cache_event_ids, atom_hw_cache_event_ids, | 1424 | memcpy(hw_cache_event_ids, atom_hw_cache_event_ids, |
1427 | sizeof(u64)*PERF_COUNT_HW_CACHE_MAX* | 1425 | sizeof(hw_cache_event_ids)); |
1428 | PERF_COUNT_HW_CACHE_OP_MAX*PERF_COUNT_HW_CACHE_RESULT_MAX); | ||
1429 | 1426 | ||
1430 | pr_cont("Atom events, "); | 1427 | pr_cont("Atom events, "); |
1431 | break; | 1428 | break; |