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>
Этот коммит содержится в:
@@ -1091,7 +1091,7 @@ void mce_log_therm_throt_event(__u64 status)
|
||||
*/
|
||||
static int check_interval = 5 * 60; /* 5 minutes */
|
||||
|
||||
static DEFINE_PER_CPU(int, next_interval); /* in jiffies */
|
||||
static DEFINE_PER_CPU(int, mce_next_interval); /* in jiffies */
|
||||
static DEFINE_PER_CPU(struct timer_list, mce_timer);
|
||||
|
||||
static void mcheck_timer(unsigned long data)
|
||||
@@ -1110,7 +1110,7 @@ static void mcheck_timer(unsigned long data)
|
||||
* Alert userspace if needed. If we logged an MCE, reduce the
|
||||
* polling interval, otherwise increase the polling interval.
|
||||
*/
|
||||
n = &__get_cpu_var(next_interval);
|
||||
n = &__get_cpu_var(mce_next_interval);
|
||||
if (mce_notify_irq())
|
||||
*n = max(*n/2, HZ/100);
|
||||
else
|
||||
@@ -1311,7 +1311,7 @@ static void mce_cpu_features(struct cpuinfo_x86 *c)
|
||||
static void mce_init_timer(void)
|
||||
{
|
||||
struct timer_list *t = &__get_cpu_var(mce_timer);
|
||||
int *n = &__get_cpu_var(next_interval);
|
||||
int *n = &__get_cpu_var(mce_next_interval);
|
||||
|
||||
if (mce_ignore_ce)
|
||||
return;
|
||||
@@ -1914,7 +1914,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
|
||||
case CPU_DOWN_FAILED:
|
||||
case CPU_DOWN_FAILED_FROZEN:
|
||||
t->expires = round_jiffies(jiffies +
|
||||
__get_cpu_var(next_interval));
|
||||
__get_cpu_var(mce_next_interval));
|
||||
add_timer_on(t, cpu);
|
||||
smp_call_function_single(cpu, mce_reenable_cpu, &action, 1);
|
||||
break;
|
||||
|
@@ -862,7 +862,7 @@ amd_pmu_disable_counter(struct hw_perf_counter *hwc, int idx)
|
||||
x86_pmu_disable_counter(hwc, idx);
|
||||
}
|
||||
|
||||
static DEFINE_PER_CPU(u64 [X86_PMC_IDX_MAX], prev_left);
|
||||
static DEFINE_PER_CPU(u64 [X86_PMC_IDX_MAX], pmc_prev_left);
|
||||
|
||||
/*
|
||||
* Set the next IRQ period, based on the hwc->period_left value.
|
||||
@@ -901,7 +901,7 @@ x86_perf_counter_set_period(struct perf_counter *counter,
|
||||
if (left > x86_pmu.max_period)
|
||||
left = x86_pmu.max_period;
|
||||
|
||||
per_cpu(prev_left[idx], smp_processor_id()) = left;
|
||||
per_cpu(pmc_prev_left[idx], smp_processor_id()) = left;
|
||||
|
||||
/*
|
||||
* The hw counter starts counting from this counter offset,
|
||||
@@ -1089,7 +1089,7 @@ void perf_counter_print_debug(void)
|
||||
rdmsrl(x86_pmu.eventsel + idx, pmc_ctrl);
|
||||
rdmsrl(x86_pmu.perfctr + idx, pmc_count);
|
||||
|
||||
prev_left = per_cpu(prev_left[idx], cpu);
|
||||
prev_left = per_cpu(pmc_prev_left[idx], cpu);
|
||||
|
||||
pr_info("CPU#%d: gen-PMC%d ctrl: %016llx\n",
|
||||
cpu, idx, pmc_ctrl);
|
||||
@@ -1561,8 +1561,8 @@ void callchain_store(struct perf_callchain_entry *entry, u64 ip)
|
||||
entry->ip[entry->nr++] = ip;
|
||||
}
|
||||
|
||||
static DEFINE_PER_CPU(struct perf_callchain_entry, irq_entry);
|
||||
static DEFINE_PER_CPU(struct perf_callchain_entry, nmi_entry);
|
||||
static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry);
|
||||
static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry);
|
||||
|
||||
|
||||
static void
|
||||
@@ -1709,9 +1709,9 @@ struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
|
||||
struct perf_callchain_entry *entry;
|
||||
|
||||
if (in_nmi())
|
||||
entry = &__get_cpu_var(nmi_entry);
|
||||
entry = &__get_cpu_var(pmc_nmi_entry);
|
||||
else
|
||||
entry = &__get_cpu_var(irq_entry);
|
||||
entry = &__get_cpu_var(pmc_irq_entry);
|
||||
|
||||
entry->nr = 0;
|
||||
|
||||
|
Ссылка в новой задаче
Block a user