aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcu
diff options
context:
space:
mode:
authorIulia Manda <iulia.manda21@gmail.com>2014-03-11 07:18:22 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-04-29 11:43:38 -0400
commit9b67122ae3da3018c966148233739116ed89502a (patch)
treee2ac8517c0e5b100ba3713073d3a212e2fa4c313 /kernel/rcu
parent365187fbc04fd55766bf6a94e37e558505bf480a (diff)
rcu: Remove unused rcu_data structure field
The ->preemptible field in rcu_data is only initialized in the function rcu_init_percpu_data(), and never used. This commit therefore removes this field. Signed-off-by: Iulia Manda <iulia.manda21@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'kernel/rcu')
-rw-r--r--kernel/rcu/tree.c6
-rw-r--r--kernel/rcu/tree.h1
2 files changed, 2 insertions, 5 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index b4688993e956..2cc39c781085 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3180,7 +3180,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
3180 * that this CPU cannot possibly have any RCU callbacks in flight yet. 3180 * that this CPU cannot possibly have any RCU callbacks in flight yet.
3181 */ 3181 */
3182static void 3182static void
3183rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible) 3183rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
3184{ 3184{
3185 unsigned long flags; 3185 unsigned long flags;
3186 unsigned long mask; 3186 unsigned long mask;
@@ -3193,7 +3193,6 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
3193 /* Set up local state, ensuring consistent view of global state. */ 3193 /* Set up local state, ensuring consistent view of global state. */
3194 raw_spin_lock_irqsave(&rnp->lock, flags); 3194 raw_spin_lock_irqsave(&rnp->lock, flags);
3195 rdp->beenonline = 1; /* We have now been online. */ 3195 rdp->beenonline = 1; /* We have now been online. */
3196 rdp->preemptible = preemptible;
3197 rdp->qlen_last_fqs_check = 0; 3196 rdp->qlen_last_fqs_check = 0;
3198 rdp->n_force_qs_snap = rsp->n_force_qs; 3197 rdp->n_force_qs_snap = rsp->n_force_qs;
3199 rdp->blimit = blimit; 3198 rdp->blimit = blimit;
@@ -3237,8 +3236,7 @@ static void rcu_prepare_cpu(int cpu)
3237 struct rcu_state *rsp; 3236 struct rcu_state *rsp;
3238 3237
3239 for_each_rcu_flavor(rsp) 3238 for_each_rcu_flavor(rsp)
3240 rcu_init_percpu_data(cpu, rsp, 3239 rcu_init_percpu_data(cpu, rsp);
3241 strcmp(rsp->name, "rcu_preempt") == 0);
3242} 3240}
3243 3241
3244/* 3242/*
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index 7b572c5c65e1..13766ad2f4ee 100644
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -252,7 +252,6 @@ struct rcu_data {
252 bool passed_quiesce; /* User-mode/idle loop etc. */ 252 bool passed_quiesce; /* User-mode/idle loop etc. */
253 bool qs_pending; /* Core waits for quiesc state. */ 253 bool qs_pending; /* Core waits for quiesc state. */
254 bool beenonline; /* CPU online at least once. */ 254 bool beenonline; /* CPU online at least once. */
255 bool preemptible; /* Preemptible RCU? */
256 struct rcu_node *mynode; /* This CPU's leaf of hierarchy */ 255 struct rcu_node *mynode; /* This CPU's leaf of hierarchy */
257 unsigned long grpmask; /* Mask to apply to leaf qsmask. */ 256 unsigned long grpmask; /* Mask to apply to leaf qsmask. */
258#ifdef CONFIG_RCU_CPU_STALL_INFO 257#ifdef CONFIG_RCU_CPU_STALL_INFO