diff options
author | Paul E. McKenney <paul.mckenney@linaro.org> | 2011-02-23 20:03:06 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-05-06 02:16:58 -0400 |
commit | ddeb75814f09205df795121d9e373e82de7f2aca (patch) | |
tree | d642fc3753308a76846418a4a020a9d851781a4b /kernel | |
parent | f0a07aeaf8935b7e9ef8032ce6546169f143951c (diff) |
rcu: code cleanups in TINY_RCU priority boosting.
Extraneous semicolon, bad comment, and fold INIT_LIST_HEAD() into
list_del() to get list_del_init().
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/rcutiny_plugin.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h index 3cb8e362e883..0bc9f732d1a5 100644 --- a/kernel/rcutiny_plugin.h +++ b/kernel/rcutiny_plugin.h | |||
@@ -339,7 +339,7 @@ static void rcu_initiate_expedited_boost(void) | |||
339 | raw_local_irq_restore(flags); | 339 | raw_local_irq_restore(flags); |
340 | } | 340 | } |
341 | 341 | ||
342 | #define RCU_BOOST_DELAY_JIFFIES DIV_ROUND_UP(CONFIG_RCU_BOOST_DELAY * HZ, 1000); | 342 | #define RCU_BOOST_DELAY_JIFFIES DIV_ROUND_UP(CONFIG_RCU_BOOST_DELAY * HZ, 1000) |
343 | 343 | ||
344 | /* | 344 | /* |
345 | * Do priority-boost accounting for the start of a new grace period. | 345 | * Do priority-boost accounting for the start of a new grace period. |
@@ -418,7 +418,7 @@ static void rcu_preempt_cpu_qs(void) | |||
418 | if (!rcu_preempt_gp_in_progress()) | 418 | if (!rcu_preempt_gp_in_progress()) |
419 | return; | 419 | return; |
420 | /* | 420 | /* |
421 | * Check up on boosting. If there are no readers blocking the | 421 | * Check up on boosting. If there are readers blocking the |
422 | * current grace period, leave. | 422 | * current grace period, leave. |
423 | */ | 423 | */ |
424 | if (rcu_initiate_boost()) | 424 | if (rcu_initiate_boost()) |
@@ -578,7 +578,7 @@ static void rcu_read_unlock_special(struct task_struct *t) | |||
578 | empty = !rcu_preempt_blocked_readers_cgp(); | 578 | empty = !rcu_preempt_blocked_readers_cgp(); |
579 | empty_exp = rcu_preempt_ctrlblk.exp_tasks == NULL; | 579 | empty_exp = rcu_preempt_ctrlblk.exp_tasks == NULL; |
580 | np = rcu_next_node_entry(t); | 580 | np = rcu_next_node_entry(t); |
581 | list_del(&t->rcu_node_entry); | 581 | list_del_init(&t->rcu_node_entry); |
582 | if (&t->rcu_node_entry == rcu_preempt_ctrlblk.gp_tasks) | 582 | if (&t->rcu_node_entry == rcu_preempt_ctrlblk.gp_tasks) |
583 | rcu_preempt_ctrlblk.gp_tasks = np; | 583 | rcu_preempt_ctrlblk.gp_tasks = np; |
584 | if (&t->rcu_node_entry == rcu_preempt_ctrlblk.exp_tasks) | 584 | if (&t->rcu_node_entry == rcu_preempt_ctrlblk.exp_tasks) |
@@ -587,7 +587,6 @@ static void rcu_read_unlock_special(struct task_struct *t) | |||
587 | if (&t->rcu_node_entry == rcu_preempt_ctrlblk.boost_tasks) | 587 | if (&t->rcu_node_entry == rcu_preempt_ctrlblk.boost_tasks) |
588 | rcu_preempt_ctrlblk.boost_tasks = np; | 588 | rcu_preempt_ctrlblk.boost_tasks = np; |
589 | #endif /* #ifdef CONFIG_RCU_BOOST */ | 589 | #endif /* #ifdef CONFIG_RCU_BOOST */ |
590 | INIT_LIST_HEAD(&t->rcu_node_entry); | ||
591 | 590 | ||
592 | /* | 591 | /* |
593 | * If this was the last task on the current list, and if | 592 | * If this was the last task on the current list, and if |