diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-25 03:42:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-25 03:42:49 -0400 |
| commit | 4d8cd7e780aab781e40ea3178bdbae089f5125a0 (patch) | |
| tree | 8c9722455b869c7c212955c25199c07dcf8d90ac | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| parent | 92c38702e98e58438c3760ebb279c40bbca8bd5f (diff) | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
| -rw-r--r-- | kernel/rcutree.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index 1050d6d3922c..d0c5baf1ab18 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
| @@ -1820,7 +1820,6 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu), | |||
| 1820 | * a quiescent state betweentimes. | 1820 | * a quiescent state betweentimes. |
| 1821 | */ | 1821 | */ |
| 1822 | local_irq_save(flags); | 1822 | local_irq_save(flags); |
| 1823 | WARN_ON_ONCE(cpu_is_offline(smp_processor_id())); | ||
| 1824 | rdp = this_cpu_ptr(rsp->rda); | 1823 | rdp = this_cpu_ptr(rsp->rda); |
| 1825 | 1824 | ||
| 1826 | /* Add the callback to our list. */ | 1825 | /* Add the callback to our list. */ |