diff options
| author | Kevin Winchester <kjwinchester@gmail.com> | 2011-08-30 20:41:05 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-26 12:58:00 +0200 |
| commit | de0428a7ad4856c7b5b8a2792488ac893e6f3faa (patch) | |
| tree | 63cf492f6e6a1b11aa8d4271df50b7c71649a49d /arch/x86/kernel/cpu/perf_event_p4.c | |
| parent | ed3982cf3748b657ffb79d9d1c2e4a562661db2d (diff) | |
| download | kernel_goldelico_gta04-de0428a7ad4856c7b5b8a2792488ac893e6f3faa.zip kernel_goldelico_gta04-de0428a7ad4856c7b5b8a2792488ac893e6f3faa.tar.gz kernel_goldelico_gta04-de0428a7ad4856c7b5b8a2792488ac893e6f3faa.tar.bz2 | |
x86, perf: Clean up perf_event cpu code
The CPU support for perf events on x86 was implemented via included C files
with #ifdefs. Clean this up by creating a new header file and compiling
the vendor-specific files as needed.
Signed-off-by: Kevin Winchester <kjwinchester@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1314747665-2090-1-git-send-email-kjwinchester@gmail.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_p4.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_p4.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c index 7809d2b..492bf13 100644 --- a/arch/x86/kernel/cpu/perf_event_p4.c +++ b/arch/x86/kernel/cpu/perf_event_p4.c @@ -7,9 +7,13 @@ * For licencing details see kernel-base/COPYING */ -#ifdef CONFIG_CPU_SUP_INTEL +#include <linux/perf_event.h> #include <asm/perf_event_p4.h> +#include <asm/hardirq.h> +#include <asm/apic.h> + +#include "perf_event.h" #define P4_CNTR_LIMIT 3 /* @@ -1303,7 +1307,7 @@ static __initconst const struct x86_pmu p4_pmu = { .perfctr_second_write = 1, }; -static __init int p4_pmu_init(void) +__init int p4_pmu_init(void) { unsigned int low, high; @@ -1326,5 +1330,3 @@ static __init int p4_pmu_init(void) return 0; } - -#endif /* CONFIG_CPU_SUP_INTEL */ |