diff options
Diffstat (limited to 'kernel/rcutree.c')
-rw-r--r-- | kernel/rcutree.c | 7 |
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 | } |