Convert all uses of __get_cpu_var for address calculation to use this_cpu_ptr instead. CC: Ingo Molnar Cc: Peter Zijlstra Signed-off-by: Christoph Lameter Index: linux/include/linux/kernel_stat.h =================================================================== --- linux.orig/include/linux/kernel_stat.h 2013-12-02 16:07:53.004544351 -0600 +++ linux/include/linux/kernel_stat.h 2013-12-02 16:07:52.994544630 -0600 @@ -44,8 +44,8 @@ DECLARE_PER_CPU(struct kernel_stat, ksta DECLARE_PER_CPU(struct kernel_cpustat, kernel_cpustat); /* Must have preemption disabled for this to be meaningful. */ -#define kstat_this_cpu (&__get_cpu_var(kstat)) -#define kcpustat_this_cpu (&__get_cpu_var(kernel_cpustat)) +#define kstat_this_cpu this_cpu_ptr(&kstat) +#define kcpustat_this_cpu this_cpu_ptr(&kernel_cpustat) #define kstat_cpu(cpu) per_cpu(kstat, cpu) #define kcpustat_cpu(cpu) per_cpu(kernel_cpustat, cpu) Index: linux/kernel/events/callchain.c =================================================================== --- linux.orig/kernel/events/callchain.c 2013-12-02 16:07:53.004544351 -0600 +++ linux/kernel/events/callchain.c 2013-12-02 16:07:52.994544630 -0600 @@ -137,7 +137,7 @@ static struct perf_callchain_entry *get_ int cpu; struct callchain_cpus_entries *entries; - *rctx = get_recursion_context(__get_cpu_var(callchain_recursion)); + *rctx = get_recursion_context(this_cpu_ptr(callchain_recursion)); if (*rctx == -1) return NULL; @@ -153,7 +153,7 @@ static struct perf_callchain_entry *get_ static void put_callchain_entry(int rctx) { - put_recursion_context(__get_cpu_var(callchain_recursion), rctx); + put_recursion_context(this_cpu_ptr(callchain_recursion), rctx); } struct perf_callchain_entry * Index: linux/kernel/events/core.c =================================================================== --- linux.orig/kernel/events/core.c 2013-12-02 16:07:53.004544351 -0600 +++ linux/kernel/events/core.c 2013-12-02 16:07:53.004544351 -0600 @@ -240,10 +240,10 @@ void perf_sample_event_took(u64 sample_l return; /* decay the counter by 1 average sample */ - local_samples_len = __get_cpu_var(running_sample_length); + local_samples_len = __this_cpu_read(running_sample_length); local_samples_len -= local_samples_len/NR_ACCUMULATED_SAMPLES; local_samples_len += sample_len_ns; - __get_cpu_var(running_sample_length) = local_samples_len; + __this_cpu_write(running_sample_length, local_samples_len); /* * note: this will be biased artifically low until we have @@ -869,7 +869,7 @@ static DEFINE_PER_CPU(struct list_head, static void perf_pmu_rotate_start(struct pmu *pmu) { struct perf_cpu_context *cpuctx = this_cpu_ptr(pmu->pmu_cpu_context); - struct list_head *head = &__get_cpu_var(rotation_list); + struct list_head *head = this_cpu_ptr(&rotation_list); WARN_ON(!irqs_disabled()); @@ -2354,7 +2354,7 @@ void __perf_event_task_sched_out(struct * to check if we have to switch out PMU state. * cgroup event are system-wide mode only */ - if (atomic_read(&__get_cpu_var(perf_cgroup_events))) + if (atomic_read(this_cpu_ptr(&perf_cgroup_events))) perf_cgroup_sched_out(task, next); } @@ -2599,11 +2599,11 @@ void __perf_event_task_sched_in(struct t * to check if we have to switch in PMU state. * cgroup event are system-wide mode only */ - if (atomic_read(&__get_cpu_var(perf_cgroup_events))) + if (atomic_read(this_cpu_ptr(&perf_cgroup_events))) perf_cgroup_sched_in(prev, task); /* check for system-wide branch_stack events */ - if (atomic_read(&__get_cpu_var(perf_branch_stack_events))) + if (atomic_read(this_cpu_ptr(&perf_branch_stack_events))) perf_branch_stack_sched_in(prev, task); } @@ -2854,7 +2854,7 @@ bool perf_event_can_stop_tick(void) void perf_event_task_tick(void) { - struct list_head *head = &__get_cpu_var(rotation_list); + struct list_head *head = this_cpu_ptr(&rotation_list); struct perf_cpu_context *cpuctx, *tmp; struct perf_event_context *ctx; int throttled; @@ -5554,7 +5554,7 @@ static void do_perf_sw_event(enum perf_t struct perf_sample_data *data, struct pt_regs *regs) { - struct swevent_htable *swhash = &__get_cpu_var(swevent_htable); + struct swevent_htable *swhash = this_cpu_ptr(&swevent_htable); struct perf_event *event; struct hlist_head *head; @@ -5573,7 +5573,7 @@ end: int perf_swevent_get_recursion_context(void) { - struct swevent_htable *swhash = &__get_cpu_var(swevent_htable); + struct swevent_htable *swhash = this_cpu_ptr(&swevent_htable); return get_recursion_context(swhash->recursion); } @@ -5581,7 +5581,7 @@ EXPORT_SYMBOL_GPL(perf_swevent_get_recur inline void perf_swevent_put_recursion_context(int rctx) { - struct swevent_htable *swhash = &__get_cpu_var(swevent_htable); + struct swevent_htable *swhash = this_cpu_ptr(&swevent_htable); put_recursion_context(swhash->recursion, rctx); } @@ -5610,7 +5610,7 @@ static void perf_swevent_read(struct per static int perf_swevent_add(struct perf_event *event, int flags) { - struct swevent_htable *swhash = &__get_cpu_var(swevent_htable); + struct swevent_htable *swhash = this_cpu_ptr(&swevent_htable); struct hw_perf_event *hwc = &event->hw; struct hlist_head *head; Index: linux/kernel/sched/fair.c =================================================================== --- linux.orig/kernel/sched/fair.c 2013-12-02 16:07:53.004544351 -0600 +++ linux/kernel/sched/fair.c 2013-12-02 16:07:53.004544351 -0600 @@ -6146,7 +6146,7 @@ static int load_balance(int this_cpu, st struct sched_group *group; struct rq *busiest; unsigned long flags; - struct cpumask *cpus = __get_cpu_var(load_balance_mask); + struct cpumask *cpus = this_cpu_ptr(load_balance_mask); struct lb_env env = { .sd = sd, Index: linux/kernel/sched/rt.c =================================================================== --- linux.orig/kernel/sched/rt.c 2013-12-02 16:07:53.004544351 -0600 +++ linux/kernel/sched/rt.c 2013-12-02 16:07:53.004544351 -0600 @@ -1387,7 +1387,7 @@ static DEFINE_PER_CPU(cpumask_var_t, loc static int find_lowest_rq(struct task_struct *task) { struct sched_domain *sd; - struct cpumask *lowest_mask = __get_cpu_var(local_cpu_mask); + struct cpumask *lowest_mask = this_cpu_ptr(local_cpu_mask); int this_cpu = smp_processor_id(); int cpu = task_cpu(task); Index: linux/kernel/sched/sched.h =================================================================== --- linux.orig/kernel/sched/sched.h 2013-12-02 16:07:53.004544351 -0600 +++ linux/kernel/sched/sched.h 2013-12-02 16:07:53.004544351 -0600 @@ -545,10 +545,10 @@ static inline int cpu_of(struct rq *rq) DECLARE_PER_CPU(struct rq, runqueues); #define cpu_rq(cpu) (&per_cpu(runqueues, (cpu))) -#define this_rq() (&__get_cpu_var(runqueues)) +#define this_rq() this_cpu_ptr(&runqueues) #define task_rq(p) cpu_rq(task_cpu(p)) #define cpu_curr(cpu) (cpu_rq(cpu)->curr) -#define raw_rq() (&__raw_get_cpu_var(runqueues)) +#define raw_rq() raw_cpu_ptr(&runqueues) static inline u64 rq_clock(struct rq *rq) { Index: linux/kernel/user-return-notifier.c =================================================================== --- linux.orig/kernel/user-return-notifier.c 2013-12-02 16:07:53.004544351 -0600 +++ linux/kernel/user-return-notifier.c 2013-12-02 16:07:53.004544351 -0600 @@ -14,7 +14,7 @@ static DEFINE_PER_CPU(struct hlist_head, void user_return_notifier_register(struct user_return_notifier *urn) { set_tsk_thread_flag(current, TIF_USER_RETURN_NOTIFY); - hlist_add_head(&urn->link, &__get_cpu_var(return_notifier_list)); + hlist_add_head(&urn->link, this_cpu_ptr(&return_notifier_list)); } EXPORT_SYMBOL_GPL(user_return_notifier_register); @@ -25,7 +25,7 @@ EXPORT_SYMBOL_GPL(user_return_notifier_r void user_return_notifier_unregister(struct user_return_notifier *urn) { hlist_del(&urn->link); - if (hlist_empty(&__get_cpu_var(return_notifier_list))) + if (hlist_empty(this_cpu_ptr(&return_notifier_list))) clear_tsk_thread_flag(current, TIF_USER_RETURN_NOTIFY); } EXPORT_SYMBOL_GPL(user_return_notifier_unregister); Index: linux/kernel/taskstats.c =================================================================== --- linux.orig/kernel/taskstats.c 2013-12-02 16:07:53.004544351 -0600 +++ linux/kernel/taskstats.c 2013-12-02 16:07:53.004544351 -0600 @@ -638,7 +638,7 @@ void taskstats_exit(struct task_struct * fill_tgid_exit(tsk); } - listeners = __this_cpu_ptr(&listener_array); + listeners = raw_cpu_ptr(&listener_array); if (list_empty(&listeners->list)) return; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/