From 3920a409588ce76bff7f1927ad6ad6765f24a7f2 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Thu, 16 Jun 2011 16:02:54 -0700 Subject: [PATCH] --- yaml --- r: 268942 b: refs/heads/master c: 1eb521210a8c9823038abe4ddfe8c69e713ec17d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcutree_plugin.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d592685bd2e9..8fb76822ea92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f288094807861ec1e48c428d2c49ccf7aaf3767 +refs/heads/master: 1eb521210a8c9823038abe4ddfe8c69e713ec17d diff --git a/trunk/kernel/rcutree_plugin.h b/trunk/kernel/rcutree_plugin.h index 7b850cdc0aee..970329853dc5 100644 --- a/trunk/kernel/rcutree_plugin.h +++ b/trunk/kernel/rcutree_plugin.h @@ -1291,11 +1291,9 @@ static void invoke_rcu_callbacks_kthread(void) local_irq_save(flags); __this_cpu_write(rcu_cpu_has_work, 1); - if (__this_cpu_read(rcu_cpu_kthread_task) == NULL) { - local_irq_restore(flags); - return; - } - wake_up_process(__this_cpu_read(rcu_cpu_kthread_task)); + if (__this_cpu_read(rcu_cpu_kthread_task) != NULL && + current != __this_cpu_read(rcu_cpu_kthread_task)) + wake_up_process(__this_cpu_read(rcu_cpu_kthread_task)); local_irq_restore(flags); }