projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next
[cascardo/linux.git]
/
kernel
/
smp.c
diff --git
a/kernel/smp.c
b/kernel/smp.c
index
9e0d0b2
..
f38a1e6
100644
(file)
--- a/
kernel/smp.c
+++ b/
kernel/smp.c
@@
-165,7
+165,7
@@
static int generic_exec_single(int cpu, struct call_single_data *csd,
if (!csd) {
csd = &csd_stack;
if (!wait)
if (!csd) {
csd = &csd_stack;
if (!wait)
- csd =
&__get_cpu_var(
csd_data);
+ csd =
this_cpu_ptr(&
csd_data);
}
csd_lock(csd);
}
csd_lock(csd);
@@
-230,7
+230,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_reverse_order(entry);
entry = llist_del_all(head);
entry = llist_reverse_order(entry);
@@
-420,7
+420,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_clear_cpu(this_cpu, cfd->cpumask);
cpumask_and(cfd->cpumask, mask, cpu_online_mask);
cpumask_clear_cpu(this_cpu, cfd->cpumask);