The following commit has been merged in the master branch: commit 7ff90e3ed3c8eba10c582a83332c01a20970f806 Author: Andrew Morton akpm@linux-foundation.org Date: Thu Feb 7 12:32:19 2013 +1100
hlist-drop-the-node-parameter-from-iterators-fix-fix-fix
fix warnings
Reported-by: Wu Fengguang fengguang.wu@intel.com Cc: Sasha Levin sasha.levin@oracle.com Cc: Tejun Heo tj@kernel.org Signed-off-by: Andrew Morton akpm@linux-foundation.org
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 2f570ce..3710ba8 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1610,7 +1610,6 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type, struct cgroupfs_root *existing_root; const struct cred *cred; int i; - struct hlist_node *node; struct css_set *cg;
BUG_ON(sb->s_root != NULL); @@ -4456,7 +4455,7 @@ int __init_or_module cgroup_load_subsys(struct cgroup_subsys *ss) { struct cgroup_subsys_state *css; int i, ret; - struct hlist_node *node, *tmp; + struct hlist_node *tmp; struct css_set *cg; unsigned long key;
@@ -4534,7 +4533,7 @@ int __init_or_module cgroup_load_subsys(struct cgroup_subsys *ss) cg->subsys[ss->subsys_id] = css; /* recompute hash and restore entry */ key = css_set_hash(cg->subsys); - hash_add(css_set_table, node, key); + hash_add(css_set_table, &cg->hlist, key); } write_unlock(&css_set_lock);
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 43d0f89..96fb80b 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -408,7 +408,6 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_priv *bat_priv = netdev_priv(net_dev); struct batadv_hashtable *hash = bat_priv->orig_hash; - struct hlist_node *node_tmp; struct hlist_head *head; struct batadv_hard_iface *primary_if; struct batadv_orig_node *orig_node;