From 08b2ba7f0232a705f4e135613de8681801de2e59 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 23 Feb 2011 11:10:52 -0800 Subject: [PATCH] --- yaml --- r: 245755 b: refs/heads/master c: f0a07aeaf8935b7e9ef8032ce6546169f143951c h: refs/heads/master i: 245753: 6449e9f128ea0aa1bfccfceb7cbadc655bc1608f 245751: d53c45fe524e02efa425d2a640bf202fe89536e5 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 379a82f6ba1f..9f7b5db0547a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 108aae22339f445c134aeb48eca25df1014ab08d +refs/heads/master: f0a07aeaf8935b7e9ef8032ce6546169f143951c diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index 575d6414763e..27304bc15eca 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -1480,18 +1480,14 @@ static void rcu_process_callbacks(void) static void invoke_rcu_cpu_kthread(void) { unsigned long flags; - wait_queue_head_t *q; - int cpu; local_irq_save(flags); - cpu = smp_processor_id(); - per_cpu(rcu_cpu_has_work, cpu) = 1; - if (per_cpu(rcu_cpu_kthread_task, cpu) == NULL) { + __this_cpu_write(rcu_cpu_has_work, 1); + if (__this_cpu_read(rcu_cpu_kthread_task) == NULL) { local_irq_restore(flags); return; } - q = &per_cpu(rcu_cpu_wq, cpu); - wake_up(q); + wake_up(&__get_cpu_var(rcu_cpu_wq)); local_irq_restore(flags); }