diff options
-rw-r--r-- | arch/x86/kernel/cpu/perf_counter.c | 4 |
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 @@ | |||
17 | #include <linux/kdebug.h> | 17 | #include <linux/kdebug.h> |
18 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
19 | 19 | ||
20 | #include <asm/perf_counter.h> | ||
21 | #include <asm/apic.h> | 20 | #include <asm/apic.h> |
22 | 21 | ||
23 | static bool perf_counters_initialized __read_mostly; | 22 | static bool perf_counters_initialized __read_mostly; |
@@ -954,9 +953,6 @@ static struct pmc_x86_ops *pmc_intel_init(void) | |||
954 | 953 | ||
955 | static struct pmc_x86_ops *pmc_amd_init(void) | 954 | static struct pmc_x86_ops *pmc_amd_init(void) |
956 | { | 955 | { |
957 | u64 old; | ||
958 | int bits; | ||
959 | |||
960 | nr_counters_generic = 4; | 956 | nr_counters_generic = 4; |
961 | nr_counters_fixed = 0; | 957 | nr_counters_fixed = 0; |
962 | counter_value_mask = 0x0000FFFFFFFFFFFFULL; | 958 | counter_value_mask = 0x0000FFFFFFFFFFFFULL; |