diff options
-rw-r--r-- | kernel/rcutree.c | 2 | ||||
-rw-r--r-- | kernel/rcutree_plugin.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index 65a807b4f58c..b07be37d2aa3 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
@@ -476,7 +476,9 @@ static void print_other_cpu_stall(struct rcu_state *rsp) | |||
476 | 476 | ||
477 | printk(KERN_ERR "INFO: RCU detected CPU stalls:"); | 477 | printk(KERN_ERR "INFO: RCU detected CPU stalls:"); |
478 | rcu_for_each_leaf_node(rsp, rnp) { | 478 | rcu_for_each_leaf_node(rsp, rnp) { |
479 | raw_spin_lock_irqsave(&rnp->lock, flags); | ||
479 | rcu_print_task_stall(rnp); | 480 | rcu_print_task_stall(rnp); |
481 | raw_spin_unlock_irqrestore(&rnp->lock, flags); | ||
480 | if (rnp->qsmask == 0) | 482 | if (rnp->qsmask == 0) |
481 | continue; | 483 | continue; |
482 | for (cpu = 0; cpu <= rnp->grphi - rnp->grplo; cpu++) | 484 | for (cpu = 0; cpu <= rnp->grphi - rnp->grplo; cpu++) |
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index a8b2e834fd3a..aecfe37e0117 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
@@ -318,18 +318,15 @@ EXPORT_SYMBOL_GPL(__rcu_read_unlock); | |||
318 | */ | 318 | */ |
319 | static void rcu_print_task_stall(struct rcu_node *rnp) | 319 | static void rcu_print_task_stall(struct rcu_node *rnp) |
320 | { | 320 | { |
321 | unsigned long flags; | ||
322 | struct list_head *lp; | 321 | struct list_head *lp; |
323 | int phase; | 322 | int phase; |
324 | struct task_struct *t; | 323 | struct task_struct *t; |
325 | 324 | ||
326 | if (rcu_preempted_readers(rnp)) { | 325 | if (rcu_preempted_readers(rnp)) { |
327 | raw_spin_lock_irqsave(&rnp->lock, flags); | ||
328 | phase = rnp->gpnum & 0x1; | 326 | phase = rnp->gpnum & 0x1; |
329 | lp = &rnp->blocked_tasks[phase]; | 327 | lp = &rnp->blocked_tasks[phase]; |
330 | list_for_each_entry(t, lp, rcu_node_entry) | 328 | list_for_each_entry(t, lp, rcu_node_entry) |
331 | printk(" P%d", t->pid); | 329 | printk(" P%d", t->pid); |
332 | raw_spin_unlock_irqrestore(&rnp->lock, flags); | ||
333 | } | 330 | } |
334 | } | 331 | } |
335 | 332 | ||