aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcutree.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paul.mckenney@linaro.org>2012-06-28 11:08:25 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2012-07-06 09:01:48 -0400
commitc701d5d9b384ff03ceb232ef21236364d784a411 (patch)
treeae5b4793c478d3c575e506f1d36c798b73c542ff /kernel/rcutree.c
parent02a0677b0be545a07ffb15a13419efd7c82881e0 (diff)
rcu: Fix code-style issues involving "else"
The Linux kernel coding style says that single-statement blocks should omit curly braces unless the other leg of the "if" statement has multiple statements, in which case the curly braces should be included. This commit fixes RCU's violations of this rule. 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/rcutree.c')
-rw-r--r--kernel/rcutree.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 117218a43724..f280e542e3e9 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -892,8 +892,9 @@ static void __note_new_gpnum(struct rcu_state *rsp, struct rcu_node *rnp, struct
892 if (rnp->qsmask & rdp->grpmask) { 892 if (rnp->qsmask & rdp->grpmask) {
893 rdp->qs_pending = 1; 893 rdp->qs_pending = 1;
894 rdp->passed_quiesce = 0; 894 rdp->passed_quiesce = 0;
895 } else 895 } else {
896 rdp->qs_pending = 0; 896 rdp->qs_pending = 0;
897 }
897 zero_cpu_stall_ticks(rdp); 898 zero_cpu_stall_ticks(rdp);
898 } 899 }
899} 900}
@@ -2130,9 +2131,9 @@ void synchronize_sched_expedited(void)
2130 put_online_cpus(); 2131 put_online_cpus();
2131 2132
2132 /* No joy, try again later. Or just synchronize_sched(). */ 2133 /* No joy, try again later. Or just synchronize_sched(). */
2133 if (trycount++ < 10) 2134 if (trycount++ < 10) {
2134 udelay(trycount * num_online_cpus()); 2135 udelay(trycount * num_online_cpus());
2135 else { 2136 } else {
2136 synchronize_sched(); 2137 synchronize_sched();
2137 return; 2138 return;
2138 } 2139 }