浏览代码

perf_counter, x86: Clean up hw_cache_event ids copies

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Thomas Gleixner 16 年之前
父节点
当前提交
820a644211
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3 6
      arch/x86/kernel/cpu/perf_counter.c

+ 3 - 6
arch/x86/kernel/cpu/perf_counter.c

@@ -1409,23 +1409,20 @@ static int intel_pmu_init(void)
 	switch (boot_cpu_data.x86_model) {
 	switch (boot_cpu_data.x86_model) {
 	case 17:
 	case 17:
 		memcpy(hw_cache_event_ids, core2_hw_cache_event_ids,
 		memcpy(hw_cache_event_ids, core2_hw_cache_event_ids,
-		sizeof(u64)*PERF_COUNT_HW_CACHE_MAX*
-			PERF_COUNT_HW_CACHE_OP_MAX*PERF_COUNT_HW_CACHE_RESULT_MAX);
+		       sizeof(hw_cache_event_ids));
 
 
 		pr_cont("Core2 events, ");
 		pr_cont("Core2 events, ");
 		break;
 		break;
 	default:
 	default:
 	case 26:
 	case 26:
 		memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
 		memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
-		sizeof(u64)*PERF_COUNT_HW_CACHE_MAX*
-			PERF_COUNT_HW_CACHE_OP_MAX*PERF_COUNT_HW_CACHE_RESULT_MAX);
+		       sizeof(hw_cache_event_ids));
 
 
 		pr_cont("Nehalem/Corei7 events, ");
 		pr_cont("Nehalem/Corei7 events, ");
 		break;
 		break;
 	case 28:
 	case 28:
 		memcpy(hw_cache_event_ids, atom_hw_cache_event_ids,
 		memcpy(hw_cache_event_ids, atom_hw_cache_event_ids,
-		sizeof(u64)*PERF_COUNT_HW_CACHE_MAX*
-			PERF_COUNT_HW_CACHE_OP_MAX*PERF_COUNT_HW_CACHE_RESULT_MAX);
+		       sizeof(hw_cache_event_ids));
 
 
 		pr_cont("Atom events, ");
 		pr_cont("Atom events, ");
 		break;
 		break;