Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c167b85 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, perfcounters: rename intel_arch_perfmon.h => perf_counter.h 



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: default avatarIngo Molnar <mingo@elte.hu>
parent 7995888f

arch/x86/include/asm/intel_arch_perfmon.h→arch/x86/include/asm/perf_counter.h

+3 −3
Original line number Diff line number Diff line 
#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 */

arch/x86/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/x86/kernel/cpu/perf_counter.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/cpu/perfctr-watchdog.c

+1 −1
Original line number Diff line number Diff line
@@ -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;