git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
kernel
/
irq_work.c
diff --git
a/kernel/irq_work.c
b/kernel/irq_work.c
index 385b85aded199f5f2be0ee590278b559ac53b136..3ab9048483fa9c9041747b10bd0c8ec192b9a413 100644
(file)
--- a/
kernel/irq_work.c
+++ b/
kernel/irq_work.c
@@
-95,11
+95,11
@@
bool irq_work_queue(struct irq_work *work)
/* If the work is "lazy", handle it from next tick if any */
if (work->flags & IRQ_WORK_LAZY) {
/* If the work is "lazy", handle it from next tick if any */
if (work->flags & IRQ_WORK_LAZY) {
- if (llist_add(&work->llnode,
&__get_cpu_var(
lazy_list)) &&
+ if (llist_add(&work->llnode,
this_cpu_ptr(&
lazy_list)) &&
tick_nohz_tick_stopped())
arch_irq_work_raise();
} else {
tick_nohz_tick_stopped())
arch_irq_work_raise();
} else {
- if (llist_add(&work->llnode,
&__get_cpu_var(
raised_list)))
+ if (llist_add(&work->llnode,
this_cpu_ptr(&
raised_list)))
arch_irq_work_raise();
}
arch_irq_work_raise();
}
@@
-113,8
+113,8
@@
bool irq_work_needs_cpu(void)
{
struct llist_head *raised, *lazy;
{
struct llist_head *raised, *lazy;
- raised =
&__get_cpu_var(
raised_list);
- lazy =
&__get_cpu_var(
lazy_list);
+ raised =
this_cpu_ptr(&
raised_list);
+ lazy =
this_cpu_ptr(&
lazy_list);
if (llist_empty(raised) || arch_irq_work_has_interrupt())
if (llist_empty(lazy))
if (llist_empty(raised) || arch_irq_work_has_interrupt())
if (llist_empty(lazy))
@@
-168,8
+168,8
@@
static void irq_work_run_list(struct llist_head *list)
*/
void irq_work_run(void)
{
*/
void irq_work_run(void)
{
- irq_work_run_list(
&__get_cpu_var(
raised_list));
- irq_work_run_list(
&__get_cpu_var(
lazy_list));
+ irq_work_run_list(
this_cpu_ptr(&
raised_list));
+ irq_work_run_list(
this_cpu_ptr(&
lazy_list));
}
EXPORT_SYMBOL_GPL(irq_work_run);
}
EXPORT_SYMBOL_GPL(irq_work_run);