The recent updates to RCU_CPU_FAST_NO_HZ have an rcu_needs_cpu() that does more than just check for callbacks, so get the name for rcu_preempt_needs_cpu() consistent with that change, now calling it rcu_preempt_cpu_has_callbacks().
Unified · Split
| @@ -1958,7 +1958,7 @@ static int rcu_cpu_has_callbacks(int cpu) · 1957 unmodified lines | |||
| 1958 | /* RCU callbacks either ready or pending? */ | 1958 | /* RCU callbacks either ready or pending? */ |
| 1959 | return per_cpu(rcu_sched_data, cpu).nxtlist || | 1959 | return per_cpu(rcu_sched_data, cpu).nxtlist || |
| 1960 | per_cpu(rcu_bh_data, cpu).nxtlist || | 1960 | per_cpu(rcu_bh_data, cpu).nxtlist || |
| 1961 | rcu_preempt_needs_cpu(cpu); | 1961 | rcu_preempt_cpu_has_callbacks(cpu); |
| 1962 | } | 1962 | } |
| 1963 | 1963 | ||
| 1964 | static DEFINE_PER_CPU(struct rcu_head, rcu_barrier_head) = {NULL}; | 1964 | static DEFINE_PER_CPU(struct rcu_head, rcu_barrier_head) = {NULL}; |
| @@ -449,7 +449,7 @@ static void rcu_report_exp_rnp(struct rcu_state *rsp, struct rcu_node *rnp, · 448 unmodified lines | |||
| 449 | bool wake); | 449 | bool wake); |
| 450 | #endif /* #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_TREE_PREEMPT_RCU) */ | 450 | #endif /* #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_TREE_PREEMPT_RCU) */ |
| 451 | static int rcu_preempt_pending(int cpu); | 451 | static int rcu_preempt_pending(int cpu); |
| 452 | static int rcu_preempt_needs_cpu(int cpu); | 452 | static int rcu_preempt_cpu_has_callbacks(int cpu); |
| 453 | static void __cpuinit rcu_preempt_init_percpu_data(int cpu); | 453 | static void __cpuinit rcu_preempt_init_percpu_data(int cpu); |
| 454 | static void rcu_preempt_cleanup_dying_cpu(void); | 454 | static void rcu_preempt_cleanup_dying_cpu(void); |
| 455 | static void __init __rcu_init_preempt(void); | 455 | static void __init __rcu_init_preempt(void); |
| @@ -887,9 +887,9 @@ static int rcu_preempt_pending(int cpu) · 886 unmodified lines | |||
| 887 | } | 887 | } |
| 888 | 888 | ||
| 889 | /* | 889 | /* |
| 890 | * Does preemptible RCU need the CPU to stay out of dynticks mode? | 890 | * Does preemptible RCU have callbacks on this CPU? |
| 891 | */ | 891 | */ |
| 892 | static int rcu_preempt_needs_cpu(int cpu) | 892 | static int rcu_preempt_cpu_has_callbacks(int cpu) |
| 893 | { | 893 | { |
| 894 | return !!per_cpu(rcu_preempt_data, cpu).nxtlist; | 894 | return !!per_cpu(rcu_preempt_data, cpu).nxtlist; |
| 895 | } | 895 | } |
| @@ -1128,9 +1128,9 @@ static int rcu_preempt_pending(int cpu) · 232 unmodified lines | |||
| 1128 | } | 1128 | } |
| 1129 | 1129 | ||
| 1130 | /* | 1130 | /* |
| 1131 | * Because preemptible RCU does not exist, it never needs any CPU. | 1131 | * Because preemptible RCU does not exist, it never has callbacks |
| 1132 | */ | 1132 | */ |
| 1133 | static int rcu_preempt_needs_cpu(int cpu) | 1133 | static int rcu_preempt_cpu_has_callbacks(int cpu) |
| 1134 | { | 1134 | { |
| 1135 | return 0; | 1135 | return 0; |
| 1136 | } | 1136 | } |