The following commit has been merged in the master branch: commit 83d4b7eb5f319d8c6d8586586cb1d9c0d1a80532 Author: Paul E. McKenney paulmck@linux.vnet.ibm.com Date: Tue May 11 16:33:01 2010 -0700

staging: batman: remove all rcu head initializations

Remove all rcu head inits. We don't care about the RCU head state before passing it to call_rcu() anyway. Only leave the "on_stack" variants so debugobjects can keep track of objects on stack.

Signed-off-by: Mathieu Desnoyers mathieu.desnoyers@efficios.com Signed-off-by: Paul E. McKenney paulmck@linux.vnet.ibm.com Cc: Andrew Lunn andrew@lunn.ch Cc: Simon Wunderlich siwu@hrz.tu-chemnitz.de Cc: Marek Lindner lindner_marek@yahoo.de Cc: Sven Eckelmann sven.eckelmann@gmx.de Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c index 0d1d101..7a582e8 100644 --- a/drivers/staging/batman-adv/hard-interface.c +++ b/drivers/staging/batman-adv/hard-interface.c @@ -340,7 +340,6 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) batman_if->if_num = -1; batman_if->net_dev = net_dev; batman_if->if_status = IF_NOT_IN_USE; - INIT_RCU_HEAD(&batman_if->rcu); INIT_LIST_HEAD(&batman_if->list);

check_known_mac_addr(batman_if->net_dev->dev_addr);