From a24ecd1fca4263f0ce79dcbcdafd30032d334b9d Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Mon, 4 Mar 2013 06:27:30 +0000 Subject: [PATCH] kvm tools: init: fix usage of hlist iterators Commit b67bfe0d42ca ("hlist: drop the node parameter from iterators") incorrectly changed the way that hlist iterators are used. This patch fixes util/init.c so it passes parameters to the new iterators in the right manner. Cc: Sasha Levin Signed-off-by: Marc Zyngier Signed-off-by: Will Deacon Signed-off-by: Pekka Enberg --- util/init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/util/init.c b/util/init.c index 33a5952..d4ce144 100644 --- a/util/init.c +++ b/util/init.c @@ -33,11 +33,10 @@ int init_list__init(struct kvm *kvm) { unsigned int i; int r = 0; - struct hlist_node *n; struct init_item *t; for (i = 0; i < ARRAY_SIZE(init_lists); i++) - hlist_for_each_entry(t, n, &init_lists[i], n) { + hlist_for_each_entry(t, &init_lists[i], n) { r = t->init(kvm); if (r < 0) { pr_warning("Failed init: %s\n", t->fn_name); @@ -53,11 +52,10 @@ int init_list__exit(struct kvm *kvm) { int i; int r = 0; - struct hlist_node *n; struct init_item *t; for (i = ARRAY_SIZE(exit_lists) - 1; i >= 0; i--) - hlist_for_each_entry(t, n, &exit_lists[i], n) { + hlist_for_each_entry(t, &exit_lists[i], n) { r = t->init(kvm); if (r < 0) { pr_warning("%s failed.\n", t->fn_name);