From 44b0bd38256078e6413335779f598050e5dbaada Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 3 May 2009 23:11:18 +0200 Subject: [PATCH] --- yaml --- r: 145962 b: refs/heads/master c: 41c51c98f588edcdf6141cff1895df738e03ddd4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcupreempt.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e6967c746e85..c7b0df81ade1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05725f7eb4b8acb147c5fc7b91397b1f6bcab00d +refs/heads/master: 41c51c98f588edcdf6141cff1895df738e03ddd4 diff --git a/trunk/kernel/rcupreempt.c b/trunk/kernel/rcupreempt.c index ce97a4df64d3..beb0e659adcc 100644 --- a/trunk/kernel/rcupreempt.c +++ b/trunk/kernel/rcupreempt.c @@ -1356,17 +1356,11 @@ static int rcu_sched_grace_period(void *arg) rcu_ctrlblk.sched_sleep = rcu_sched_sleeping; spin_unlock_irqrestore(&rcu_ctrlblk.schedlock, flags); - ret = 0; + ret = 0; /* unused */ __wait_event_interruptible(rcu_ctrlblk.sched_wq, rcu_ctrlblk.sched_sleep != rcu_sched_sleeping, ret); - /* - * Signals would prevent us from sleeping, and we cannot - * do much with them in any case. So flush them. - */ - if (ret) - flush_signals(current); couldsleepnext = 0; } while (!kthread_should_stop());