diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rcu/tree.c | 5 | ||||
| -rw-r--r-- | kernel/rcu/tree.h | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 99d59be761d1..86fc087c7777 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
| @@ -2844,10 +2844,8 @@ static void force_quiescent_state(struct rcu_state *rsp) | |||
| 2844 | !raw_spin_trylock(&rnp->fqslock); | 2844 | !raw_spin_trylock(&rnp->fqslock); |
| 2845 | if (rnp_old != NULL) | 2845 | if (rnp_old != NULL) |
| 2846 | raw_spin_unlock(&rnp_old->fqslock); | 2846 | raw_spin_unlock(&rnp_old->fqslock); |
| 2847 | if (ret) { | 2847 | if (ret) |
| 2848 | rsp->n_force_qs_lh++; | ||
| 2849 | return; | 2848 | return; |
| 2850 | } | ||
| 2851 | rnp_old = rnp; | 2849 | rnp_old = rnp; |
| 2852 | } | 2850 | } |
| 2853 | /* rnp_old == rcu_get_root(rsp), rnp == NULL. */ | 2851 | /* rnp_old == rcu_get_root(rsp), rnp == NULL. */ |
| @@ -2856,7 +2854,6 @@ static void force_quiescent_state(struct rcu_state *rsp) | |||
| 2856 | raw_spin_lock_irqsave_rcu_node(rnp_old, flags); | 2854 | raw_spin_lock_irqsave_rcu_node(rnp_old, flags); |
| 2857 | raw_spin_unlock(&rnp_old->fqslock); | 2855 | raw_spin_unlock(&rnp_old->fqslock); |
| 2858 | if (READ_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) { | 2856 | if (READ_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) { |
| 2859 | rsp->n_force_qs_lh++; | ||
| 2860 | raw_spin_unlock_irqrestore_rcu_node(rnp_old, flags); | 2857 | raw_spin_unlock_irqrestore_rcu_node(rnp_old, flags); |
| 2861 | return; /* Someone beat us to it. */ | 2858 | return; /* Someone beat us to it. */ |
| 2862 | } | 2859 | } |
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h index d29bab8dea28..2edd56397b00 100644 --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h | |||
| @@ -355,10 +355,6 @@ struct rcu_state { | |||
| 355 | /* kthreads, if configured. */ | 355 | /* kthreads, if configured. */ |
| 356 | unsigned long n_force_qs; /* Number of calls to */ | 356 | unsigned long n_force_qs; /* Number of calls to */ |
| 357 | /* force_quiescent_state(). */ | 357 | /* force_quiescent_state(). */ |
| 358 | unsigned long n_force_qs_lh; /* ~Number of calls leaving */ | ||
| 359 | /* due to lock unavailable. */ | ||
| 360 | unsigned long n_force_qs_ngp; /* Number of calls leaving */ | ||
| 361 | /* due to no GP active. */ | ||
| 362 | unsigned long gp_start; /* Time at which GP started, */ | 358 | unsigned long gp_start; /* Time at which GP started, */ |
| 363 | /* but in jiffies. */ | 359 | /* but in jiffies. */ |
| 364 | unsigned long gp_activity; /* Time of last GP kthread */ | 360 | unsigned long gp_activity; /* Time of last GP kthread */ |
