percpu: clean up percpu variable definitions

Percpu variable definition is about to be updated such that all percpu
symbols including the static ones must be unique.  Update percpu
variable definitions accordingly.

* as,cfq: rename ioc_count uniquely

* cpufreq: rename cpu_dbs_info uniquely

* xen: move nesting_count out of xen_evtchn_do_upcall() and rename it

* mm: move ratelimits out of balance_dirty_pages_ratelimited_nr() and
  rename it

* ipv4,6: rename cookie_scratch uniquely

* x86 perf_counter: rename prev_left to pmc_prev_left, irq_entry to
  pmc_irq_entry and nmi_entry to pmc_nmi_entry

* perf_counter: rename disable_count to perf_disable_count

* ftrace: rename test_event_disable to ftrace_test_event_disable

* kmemleak: rename test_pointer to kmemleak_test_pointer

* mce: rename next_interval to mce_next_interval

[ Impact: percpu usage cleanups, no duplicate static percpu var names ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: linux-mm <linux-mm@kvack.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Andi Kleen <andi@firstfloor.org>

2 files changed, 14 insertions, 13 deletions

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 7fc58af748b4..a7ef465c83b9 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -65,7 +65,7 @@ struct cpu_dbs_info_s {
         int cpu;
         unsigned int enable:1;
 };
-static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
+static DEFINE_PER_CPU(struct cpu_dbs_info_s, cs_cpu_dbs_info);
 
 static unsigned int dbs_enable; /* number of CPUs using this policy */
 
@@ -138,7 +138,7 @@ dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
                      void *data)
 {
         struct cpufreq_freqs *freq = data;
-        struct cpu_dbs_info_s *this_dbs_info = &per_cpu(cpu_dbs_info,
+        struct cpu_dbs_info_s *this_dbs_info = &per_cpu(cs_cpu_dbs_info,
                                                         freq->cpu);
 
         struct cpufreq_policy *policy;
@@ -298,7 +298,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
         /* we need to re-evaluate prev_cpu_idle */
         for_each_online_cpu(j) {
                 struct cpu_dbs_info_s *dbs_info;
-                dbs_info = &per_cpu(cpu_dbs_info, j);
+                dbs_info = &per_cpu(cs_cpu_dbs_info, j);
                 dbs_info->prev_cpu_idle = get_cpu_idle_time(j,
                                                 &dbs_info->prev_cpu_wall);
                 if (dbs_tuners_ins.ignore_nice)
@@ -388,7 +388,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
                 cputime64_t cur_wall_time, cur_idle_time;
                 unsigned int idle_time, wall_time;
 
-                j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                j_dbs_info = &per_cpu(cs_cpu_dbs_info, j);
 
                 cur_idle_time = get_cpu_idle_time(j, &cur_wall_time);
 
@@ -528,7 +528,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
         unsigned int j;
         int rc;
 
-        this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
+        this_dbs_info = &per_cpu(cs_cpu_dbs_info, cpu);
 
         switch (event) {
         case CPUFREQ_GOV_START:
@@ -548,7 +548,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
                 for_each_cpu(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
-                        j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                        j_dbs_info = &per_cpu(cs_cpu_dbs_info, j);
                         j_dbs_info->cur_policy = policy;
 
                         j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j,
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 1911d1729353..36f292a7bd01 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -73,7 +73,7 @@ struct cpu_dbs_info_s {
         unsigned int enable:1,
                 sample_type:1;
 };
-static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
+static DEFINE_PER_CPU(struct cpu_dbs_info_s, od_cpu_dbs_info);
 
 static unsigned int dbs_enable; /* number of CPUs using this policy */
 
@@ -151,7 +151,8 @@ static unsigned int powersave_bias_target(struct cpufreq_policy *policy,
         unsigned int freq_hi, freq_lo;
         unsigned int index = 0;
         unsigned int jiffies_total, jiffies_hi, jiffies_lo;
-        struct cpu_dbs_info_s *dbs_info = &per_cpu(cpu_dbs_info, policy->cpu);
+        struct cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info,
+                                                   policy->cpu);
 
         if (!dbs_info->freq_table) {
                 dbs_info->freq_lo = 0;
@@ -196,7 +197,7 @@ static void ondemand_powersave_bias_init(void)
 {
         int i;
         for_each_online_cpu(i) {
-                struct cpu_dbs_info_s *dbs_info = &per_cpu(cpu_dbs_info, i);
+                struct cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, i);
                 dbs_info->freq_table = cpufreq_frequency_get_table(i);
                 dbs_info->freq_lo = 0;
         }
@@ -297,7 +298,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
         /* we need to re-evaluate prev_cpu_idle */
         for_each_online_cpu(j) {
                 struct cpu_dbs_info_s *dbs_info;
-                dbs_info = &per_cpu(cpu_dbs_info, j);
+                dbs_info = &per_cpu(od_cpu_dbs_info, j);
                 dbs_info->prev_cpu_idle = get_cpu_idle_time(j,
                                                 &dbs_info->prev_cpu_wall);
                 if (dbs_tuners_ins.ignore_nice)
@@ -391,7 +392,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
                 unsigned int load, load_freq;
                 int freq_avg;
 
-                j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                j_dbs_info = &per_cpu(od_cpu_dbs_info, j);
 
                 cur_idle_time = get_cpu_idle_time(j, &cur_wall_time);
 
@@ -548,7 +549,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
         unsigned int j;
         int rc;
 
-        this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
+        this_dbs_info = &per_cpu(od_cpu_dbs_info, cpu);
 
         switch (event) {
         case CPUFREQ_GOV_START:
@@ -570,7 +571,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
                 for_each_cpu(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
-                        j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                        j_dbs_info = &per_cpu(od_cpu_dbs_info, j);
                         j_dbs_info->cur_policy = policy;
 
                         j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j,