x86, perfcounters: rename intel_arch_perfmon.h => perf_counter.h
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 08:02:19 +0000 (09:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 11:45:09 +0000 (12:45 +0100)
Impact: rename include file

We'll be providing an asm/perf_counter.h to the generic perfcounter code,
so use the already existing x86 file for this purpose and rename it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/perf_counter.h [moved from arch/x86/include/asm/intel_arch_perfmon.h with 90% similarity]
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/perf_counter.c
arch/x86/kernel/cpu/perfctr-watchdog.c
arch/x86/oprofile/op_model_ppro.c

similarity index 90%
rename from arch/x86/include/asm/intel_arch_perfmon.h
rename to arch/x86/include/asm/perf_counter.h
index 71598a9..9dadce1 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_INTEL_ARCH_PERFMON_H
-#define _ASM_X86_INTEL_ARCH_PERFMON_H
+#ifndef _ASM_X86_PERF_COUNTER_H
+#define _ASM_X86_PERF_COUNTER_H
 
 #define MSR_ARCH_PERFMON_PERFCTR0                            0xc1
 #define MSR_ARCH_PERFMON_PERFCTR1                            0xc2
@@ -38,4 +38,4 @@ static inline void init_hw_perf_counters(void)                { }
 static inline void perf_counters_lapic_init(int nmi)   { }
 #endif
 
-#endif /* _ASM_X86_INTEL_ARCH_PERFMON_H */
+#endif /* _ASM_X86_PERF_COUNTER_H */
index 0579ec1..4f859ac 100644 (file)
@@ -31,7 +31,7 @@
 #include <linux/dmi.h>
 #include <linux/dmar.h>
 
-#include <asm/intel_arch_perfmon.h>
+#include <asm/perf_counter.h>
 #include <asm/atomic.h>
 #include <asm/smp.h>
 #include <asm/mtrr.h>
index 4461011..ad331b4 100644 (file)
@@ -17,7 +17,7 @@
 #include <asm/mmu_context.h>
 #include <asm/mtrr.h>
 #include <asm/mce.h>
-#include <asm/intel_arch_perfmon.h>
+#include <asm/perf_counter.h>
 #include <asm/pat.h>
 #include <asm/asm.h>
 #include <asm/numa.h>
index 89fad5d..a4a3a09 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/kdebug.h>
 #include <linux/sched.h>
 
-#include <asm/intel_arch_perfmon.h>
+#include <asm/perf_counter.h>
 #include <asm/apic.h>
 
 static bool perf_counters_initialized __read_mostly;
index 9abd48b..d6f5b9f 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/kprobes.h>
 
 #include <asm/apic.h>
-#include <asm/intel_arch_perfmon.h>
+#include <asm/perf_counter.h>
 
 struct nmi_watchdog_ctlblk {
        unsigned int cccr_msr;
index e9f80c7..07c9145 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/msr.h>
 #include <asm/apic.h>
 #include <asm/nmi.h>
-#include <asm/intel_arch_perfmon.h>
+#include <asm/perf_counter.h>
 
 #include "op_x86_model.h"
 #include "op_counter.h"