diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-05-13 13:41:58 -0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-07-06 16:52:18 -0400 |
| commit | d1ec4c34c7a9f328e43ea87522119258194f28f8 (patch) | |
| tree | 6da2f50adad21a3ca26512bb36e7abe00057f178 /kernel/rcu/tree.c | |
| parent | d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff) | |
rcu: Drop RCU_USER_QS in favor of NO_HZ_FULL
The RCU_USER_QS Kconfig parameter is now just a synonym for NO_HZ_FULL,
so this commit eliminates RCU_USER_QS, replacing all uses with NO_HZ_FULL.
Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'kernel/rcu/tree.c')
| -rw-r--r-- | kernel/rcu/tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 65137bc28b2b..8b5dd8ba9495 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
| @@ -701,7 +701,7 @@ void rcu_idle_enter(void) | |||
| 701 | } | 701 | } |
| 702 | EXPORT_SYMBOL_GPL(rcu_idle_enter); | 702 | EXPORT_SYMBOL_GPL(rcu_idle_enter); |
| 703 | 703 | ||
| 704 | #ifdef CONFIG_RCU_USER_QS | 704 | #ifdef CONFIG_NO_HZ_FULL |
| 705 | /** | 705 | /** |
| 706 | * rcu_user_enter - inform RCU that we are resuming userspace. | 706 | * rcu_user_enter - inform RCU that we are resuming userspace. |
| 707 | * | 707 | * |
| @@ -714,7 +714,7 @@ void rcu_user_enter(void) | |||
| 714 | { | 714 | { |
| 715 | rcu_eqs_enter(1); | 715 | rcu_eqs_enter(1); |
| 716 | } | 716 | } |
| 717 | #endif /* CONFIG_RCU_USER_QS */ | 717 | #endif /* CONFIG_NO_HZ_FULL */ |
| 718 | 718 | ||
| 719 | /** | 719 | /** |
| 720 | * rcu_irq_exit - inform RCU that current CPU is exiting irq towards idle | 720 | * rcu_irq_exit - inform RCU that current CPU is exiting irq towards idle |
| @@ -828,7 +828,7 @@ void rcu_idle_exit(void) | |||
| 828 | } | 828 | } |
| 829 | EXPORT_SYMBOL_GPL(rcu_idle_exit); | 829 | EXPORT_SYMBOL_GPL(rcu_idle_exit); |
| 830 | 830 | ||
| 831 | #ifdef CONFIG_RCU_USER_QS | 831 | #ifdef CONFIG_NO_HZ_FULL |
| 832 | /** | 832 | /** |
| 833 | * rcu_user_exit - inform RCU that we are exiting userspace. | 833 | * rcu_user_exit - inform RCU that we are exiting userspace. |
| 834 | * | 834 | * |
| @@ -839,7 +839,7 @@ void rcu_user_exit(void) | |||
| 839 | { | 839 | { |
| 840 | rcu_eqs_exit(1); | 840 | rcu_eqs_exit(1); |
| 841 | } | 841 | } |
| 842 | #endif /* CONFIG_RCU_USER_QS */ | 842 | #endif /* CONFIG_NO_HZ_FULL */ |
| 843 | 843 | ||
| 844 | /** | 844 | /** |
| 845 | * rcu_irq_enter - inform RCU that current CPU is entering irq away from idle | 845 | * rcu_irq_enter - inform RCU that current CPU is entering irq away from idle |
