|
@@ -51,6 +51,8 @@
|
|
|
|
|
|
/* Data structures. */
|
|
|
|
|
|
+static struct lock_class_key rcu_root_class;
|
|
|
+
|
|
|
#define RCU_STATE_INITIALIZER(name) { \
|
|
|
.level = { &name.node[0] }, \
|
|
|
.levelcnt = { \
|
|
@@ -1666,8 +1668,7 @@ static void __init rcu_init_one(struct rcu_state *rsp)
|
|
|
cpustride *= rsp->levelspread[i];
|
|
|
rnp = rsp->level[i];
|
|
|
for (j = 0; j < rsp->levelcnt[i]; j++, rnp++) {
|
|
|
- if (rnp != rcu_get_root(rsp))
|
|
|
- spin_lock_init(&rnp->lock);
|
|
|
+ spin_lock_init(&rnp->lock);
|
|
|
rnp->gpnum = 0;
|
|
|
rnp->qsmask = 0;
|
|
|
rnp->qsmaskinit = 0;
|
|
@@ -1690,7 +1691,7 @@ static void __init rcu_init_one(struct rcu_state *rsp)
|
|
|
INIT_LIST_HEAD(&rnp->blocked_tasks[1]);
|
|
|
}
|
|
|
}
|
|
|
- spin_lock_init(&rcu_get_root(rsp)->lock);
|
|
|
+ lockdep_set_class(&rcu_get_root(rsp)->lock, &rcu_root_class);
|
|
|
}
|
|
|
|
|
|
/*
|