1 files changed, 4 insertions, 3 deletions

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index e0d91fdf0c3c..8cb94a52d1bb 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -106,16 +106,16 @@ hw_perf_group_sched_in(struct perf_counter *group_leader,
 
 void __weak perf_counter_print_debug(void)      { }
 
-static DEFINE_PER_CPU(int, disable_count);
+static DEFINE_PER_CPU(int, perf_disable_count);
 
 void __perf_disable(void)
 {
-        __get_cpu_var(disable_count)++;
+        __get_cpu_var(perf_disable_count)++;
 }
 
 bool __perf_enable(void)
 {
-        return !--__get_cpu_var(disable_count);
+        return !--__get_cpu_var(perf_disable_count);
 }
 
 void perf_disable(void)
@@ -4215,6 +4215,7 @@ static int perf_copy_attr(struct perf_counter_attr __user *uattr,
                         if (val)
                                 goto err_size;
                 }
+                size = sizeof(*attr);
         }
 
         ret = copy_from_user(attr, uattr, size);