summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@kernel.org>2009-03-08 17:09:49 +0530
committerIngo Molnar <mingo@elte.hu>2009-03-08 16:26:50 +0100
commite255357764f92afcafafbd4879b222b8c752065a (patch)
tree1bdff7c9f17d7c1ff56501b9bc60e2fc7c106b26 /arch/x86
parent184fe4ab1f2e4dfa45584889bb3820031648386b (diff)
downloadtalos-obmc-linux-e255357764f92afcafafbd4879b222b8c752065a.tar.gz
talos-obmc-linux-e255357764f92afcafafbd4879b222b8c752065a.zip
x86: perf_counter cleanup
Remove unused variables and duplicate header file. Signed-off-by: Jaswinder Singh Rajput <jaswinder@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 1df421042b2a..155bc3c239b6 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -17,7 +17,6 @@
#include <linux/kdebug.h>
#include <linux/sched.h>
-#include <asm/perf_counter.h>
#include <asm/apic.h>
static bool perf_counters_initialized __read_mostly;
@@ -954,9 +953,6 @@ static struct pmc_x86_ops *pmc_intel_init(void)
static struct pmc_x86_ops *pmc_amd_init(void)
{
- u64 old;
- int bits;
-
nr_counters_generic = 4;
nr_counters_fixed = 0;
counter_value_mask = 0x0000FFFFFFFFFFFFULL;
OpenPOWER on IntegriCloud