From 464d9837cd627c97725112f90a3f12f5d56281c0 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinder@kernel.org>
Date: Sun, 8 Mar 2009 17:09:49 +0530
Subject: [PATCH] --- yaml --- r: 147245 b: refs/heads/master c:
 e255357764f92afcafafbd4879b222b8c752065a h: refs/heads/master i:   147243:
 a87699f971f905f41ae9ce485e03d4946eca3751 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/kernel/cpu/perf_counter.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bda1cdcd1ddf..c2f0cad2f5f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 184fe4ab1f2e4dfa45584889bb3820031648386b
+refs/heads/master: e255357764f92afcafafbd4879b222b8c752065a
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
index 1df421042b2a..155bc3c239b6 100644
--- a/trunk/arch/x86/kernel/cpu/perf_counter.c
+++ b/trunk/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;