alloc_percpu: rename percpu vars which cause name clashes. Currently DECLARE_PER_CPU vars have per_cpu__ prefixed to them, and this effectively puts them in a separate namespace. No surprise that they clash with other names when that prefix is removed. There may be others I've missed, but if so the transform is simple. Signed-off-by: Rusty Russell --- arch/x86/include/asm/timer.h | 5 +++-- arch/x86/kernel/tsc.c | 4 ++-- kernel/lockdep.c | 11 ++++++----- kernel/sched.c | 10 ++++++---- kernel/softirq.c | 4 ++-- kernel/softlockup.c | 12 ++++++------ mm/vmstat.c | 6 +++--- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -42,13 +42,14 @@ extern int no_timer_check; * -johnstul@us.ibm.com "math is hard, lets go shopping!" */ -DECLARE_PER_CPU(unsigned long, cyc2ns); +DECLARE_PER_CPU(unsigned long, percpu_cyc2ns); #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */ static inline unsigned long long __cycles_2_ns(unsigned long long cyc) { - return cyc * per_cpu(cyc2ns, smp_processor_id()) >> CYC2NS_SCALE_FACTOR; + return cyc * per_cpu(percpu_cyc2ns, smp_processor_id()) >> + CYC2NS_SCALE_FACTOR; } static inline unsigned long long cycles_2_ns(unsigned long long cyc) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -570,7 +570,7 @@ EXPORT_SYMBOL(recalibrate_cpu_khz); * -johnstul@us.ibm.com "math is hard, lets go shopping!" */ -DEFINE_PER_CPU(unsigned long, cyc2ns); +DEFINE_PER_CPU(unsigned long, percpu_cyc2ns); static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu) { @@ -580,7 +580,7 @@ static void set_cyc2ns_scale(unsigned lo local_irq_save(flags); sched_clock_idle_sleep_event(); - scale = &per_cpu(cyc2ns, cpu); + scale = &per_cpu(percpu_cyc2ns, cpu); rdtscll(tsc_now); ns_now = __cycles_2_ns(tsc_now); diff --git a/kernel/lockdep.c b/kernel/lockdep.c --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -135,7 +135,8 @@ static inline struct lock_class *hlock_c } #ifdef CONFIG_LOCK_STAT -static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], lock_stats); +static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], + percpu_lock_stats); static int lock_contention_point(struct lock_class *class, unsigned long ip) { @@ -181,7 +182,7 @@ struct lock_class_stats lock_stats(struc memset(&stats, 0, sizeof(struct lock_class_stats)); for_each_possible_cpu(cpu) { struct lock_class_stats *pcs = - &per_cpu(lock_stats, cpu)[class - lock_classes]; + &per_cpu(percpu_lock_stats, cpu)[class - lock_classes]; for (i = 0; i < ARRAY_SIZE(stats.contention_point); i++) stats.contention_point[i] += pcs->contention_point[i]; @@ -205,7 +206,7 @@ void clear_lock_stats(struct lock_class for_each_possible_cpu(cpu) { struct lock_class_stats *cpu_stats = - &per_cpu(lock_stats, cpu)[class - lock_classes]; + &per_cpu(percpu_lock_stats, cpu)[class - lock_classes]; memset(cpu_stats, 0, sizeof(struct lock_class_stats)); } @@ -214,12 +215,12 @@ void clear_lock_stats(struct lock_class static struct lock_class_stats *get_lock_stats(struct lock_class *class) { - return &get_cpu_var(lock_stats)[class - lock_classes]; + return &get_cpu_var(percpu_lock_stats)[class - lock_classes]; } static void put_lock_stats(struct lock_class_stats *stats) { - put_cpu_var(lock_stats); + put_cpu_var(percpu_lock_stats); } static void lock_release_holdtime(struct held_lock *hlock) diff --git a/kernel/sched.c b/kernel/sched.c --- a/kernel/sched.c +++ b/kernel/sched.c @@ -313,12 +313,14 @@ struct task_group root_task_group; /* Default task group's sched entity on each cpu */ static DEFINE_PER_CPU(struct sched_entity, init_sched_entity); /* Default task group's cfs_rq on each cpu */ -static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp; +static DEFINE_PER_CPU(struct cfs_rq, percpu_init_cfs_rq) + ____cacheline_aligned_in_smp; #endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED static DEFINE_PER_CPU(struct sched_rt_entity, init_sched_rt_entity); -static DEFINE_PER_CPU(struct rt_rq, init_rt_rq) ____cacheline_aligned_in_smp; +static DEFINE_PER_CPU(struct rt_rq, percpu_init_rt_rq) + ____cacheline_aligned_in_smp; #endif /* CONFIG_RT_GROUP_SCHED */ #else /* !CONFIG_USER_SCHED */ #define root_task_group init_task_group @@ -8260,7 +8262,7 @@ void __init sched_init(void) * tasks in rq->cfs (i.e init_task_group->se[] != NULL). */ init_tg_cfs_entry(&init_task_group, - &per_cpu(init_cfs_rq, i), + &per_cpu(percpu_init_cfs_rq, i), &per_cpu(init_sched_entity, i), i, 1, root_task_group.se[i]); @@ -8275,7 +8277,7 @@ void __init sched_init(void) #elif defined CONFIG_USER_SCHED init_tg_rt_entry(&root_task_group, &rq->rt, NULL, i, 0, NULL); init_tg_rt_entry(&init_task_group, - &per_cpu(init_rt_rq, i), + &per_cpu(percpu_init_rt_rq, i), &per_cpu(init_sched_rt_entity, i), i, 1, root_task_group.rt_se[i]); #endif diff --git a/kernel/softirq.c b/kernel/softirq.c --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -615,7 +615,7 @@ void __init softirq_init(void) open_softirq(HI_SOFTIRQ, tasklet_hi_action); } -static int ksoftirqd(void * __bind_cpu) +static int run_ksoftirqd(void *__bind_cpu) { set_current_state(TASK_INTERRUPTIBLE); @@ -727,7 +727,7 @@ static int __cpuinit cpu_callback(struct switch (action) { case CPU_UP_PREPARE: case CPU_UP_PREPARE_FROZEN: - p = kthread_create(ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu); + p = kthread_create(run_ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu); if (IS_ERR(p)) { printk("ksoftirqd for %i failed\n", hotcpu); return NOTIFY_BAD; diff --git a/kernel/softlockup.c b/kernel/softlockup.c --- a/kernel/softlockup.c +++ b/kernel/softlockup.c @@ -95,15 +95,15 @@ void softlockup_tick(void) void softlockup_tick(void) { int this_cpu = smp_processor_id(); - unsigned long touch_timestamp = per_cpu(touch_timestamp, this_cpu); - unsigned long print_timestamp; + unsigned long touch_ts = per_cpu(touch_timestamp, this_cpu); + unsigned long print_ts; struct pt_regs *regs = get_irq_regs(); unsigned long now; /* Is detection switched off? */ if (!per_cpu(watchdog_task, this_cpu) || softlockup_thresh <= 0) { /* Be sure we don't false trigger if switched back on */ - if (touch_timestamp) + if (touch_ts) per_cpu(touch_timestamp, this_cpu) = 0; return; } @@ -113,10 +113,10 @@ void softlockup_tick(void) return; } - print_timestamp = per_cpu(print_timestamp, this_cpu); + print_ts = per_cpu(print_timestamp, this_cpu); /* report at most once a second */ - if (print_timestamp == touch_timestamp || did_panic) + if (print_ts == touch_timestamp || did_panic) return; /* do not print during early bootup: */ @@ -138,7 +138,7 @@ void softlockup_tick(void) if (now <= (touch_timestamp + softlockup_thresh)) return; - per_cpu(print_timestamp, this_cpu) = touch_timestamp; + per_cpu(print_ts, this_cpu) = touch_timestamp; spin_lock(&print_lock); printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", diff --git a/mm/vmstat.c b/mm/vmstat.c --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -903,10 +903,10 @@ static void vmstat_update(struct work_st static void __cpuinit start_cpu_timer(int cpu) { - struct delayed_work *vmstat_work = &per_cpu(vmstat_work, cpu); + struct delayed_work *vw = &per_cpu(vmstat_work, cpu); - INIT_DELAYED_WORK_DEFERRABLE(vmstat_work, vmstat_update); - schedule_delayed_work_on(cpu, vmstat_work, HZ + cpu); + INIT_DELAYED_WORK_DEFERRABLE(vw, vmstat_update); + schedule_delayed_work_on(cpu, vw, HZ + cpu); } /*