Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88b91c7c authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

rcu: Simplify creating of lockdep class for root rcu_node 



Use lockdep_set_class() to simplify the code and to avoid any
additional overhead in the !LOCKDEP case.  Also move the
definition of rcu_root_class into kernel/rcutree.c, as suggested
by Lai Jiangshan.

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: laijs@cn.fujitsu.com
Cc: dipankar@in.ibm.com
Cc: mathieu.desnoyers@polymtl.ca
Cc: josh@joshtriplett.org
Cc: dvhltc@us.ibm.com
Cc: niv@us.ibm.com
Cc: rostedt@goodmis.org
Cc: Valdis.Kletnieks@vt.edu
Cc: dhowells@redhat.com
LKML-Reference: <1256577871443-git-send-email->
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4ce5b903

kernel/rcutree.c

+4 −3
Original line number Diff line number Diff line
@@ -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,7 +1668,6 @@ 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);

			rnp->gpnum = 0;

			rnp->qsmask = 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);

}



/*