evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel misc: Replace __get_cpu_var uses

Browse source 
Replace uses of __get_cpu_var for address calculation with this_cpu_ptr.

Cc: akpm@linux-foundation.org
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Christoph Lameter 2014-08-17 12:30:24 -05:00 • committed by Tejun Heo
parent 7d1311b93e
commit bb964a92ce
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/printk/printk.c
View file

@ -2628,7 +2628,7 @@ void wake_up_klogd(void)
preempt_disable(); preempt_disable();
if (waitqueue_active(&log_wait)) { if (waitqueue_active(&log_wait)) {
this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP); this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP);
irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); irq_work_queue(this_cpu_ptr(&wake_up_klogd_work));
} }
preempt_enable(); preempt_enable();
} }
@ -2644,7 +2644,7 @@ int printk_deferred(const char *fmt, ...)
va_end(args); va_end(args);
__this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT); __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT);
irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); irq_work_queue(this_cpu_ptr(&wake_up_klogd_work));
preempt_enable(); preempt_enable();
return r; return r;

6
kernel/smp.c
View file

@ -164,7 +164,7 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,
if (!csd) { if (!csd) {
csd = &csd_stack; csd = &csd_stack;
if (!wait) if (!wait)
csd = &__get_cpu_var(csd_data); csd = this_cpu_ptr(&csd_data);
} }
csd_lock(csd); csd_lock(csd);
@ -229,7 +229,7 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline)
WARN_ON(!irqs_disabled()); WARN_ON(!irqs_disabled());
head = &__get_cpu_var(call_single_queue); head = this_cpu_ptr(&call_single_queue);
entry = llist_del_all(head); entry = llist_del_all(head);
entry = llist_reverse_order(entry); entry = llist_reverse_order(entry);
@ -419,7 +419,7 @@ void smp_call_function_many(const struct cpumask *mask,
return; return;
} }
cfd = &__get_cpu_var(cfd_data); cfd = this_cpu_ptr(&cfd_data);
cpumask_and(cfd->cpumask, mask, cpu_online_mask); cpumask_and(cfd->cpumask, mask, cpu_online_mask);
cpumask_clear_cpu(this_cpu, cfd->cpumask); cpumask_clear_cpu(this_cpu, cfd->cpumask);