aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcutiny.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-01-14 09:30:16 -0500
committerIngo Molnar <mingo@elte.hu>2011-01-14 09:30:16 -0500
commit1161ec944916069ceec21c487e30247d9ff22857 (patch)
tree741385cbfde51286f502790cdfb77b1af2953944 /kernel/rcutiny.c
parentf123c98e7f168e949b283690693695f988332c3d (diff)
parentb24efdfdf679cf9b05947c531971905fc727dd40 (diff)
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'kernel/rcutiny.c')
-rw-r--r--kernel/rcutiny.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
index 034493724749..0c343b9a46d5 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -189,7 +189,8 @@ static int rcu_kthread(void *arg)
189 unsigned long flags; 189 unsigned long flags;
190 190
191 for (;;) { 191 for (;;) {
192 wait_event(rcu_kthread_wq, have_rcu_kthread_work != 0); 192 wait_event_interruptible(rcu_kthread_wq,
193 have_rcu_kthread_work != 0);
193 morework = rcu_boost(); 194 morework = rcu_boost();
194 local_irq_save(flags); 195 local_irq_save(flags);
195 work = have_rcu_kthread_work; 196 work = have_rcu_kthread_work;