Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / mm / kmemleak.c

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 45eb6217bf38e764bfb65d90f29ae2bb46f77886..0de83b4541e9d692d92a28da0f302714ee4ea1db 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1483,13 +1483,11 @@ static void *kmemleak_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct kmemleak_object *prev_obj = v;
        struct kmemleak_object *next_obj = NULL;
-       struct list_head *n = &prev_obj->object_list;
+       struct kmemleak_object *obj = prev_obj;
 
        ++(*pos);
 
-       list_for_each_continue_rcu(n, &object_list) {
-               struct kmemleak_object *obj =
-                       list_entry(n, struct kmemleak_object, object_list);
+       list_for_each_entry_continue_rcu(obj, &object_list, object_list) {
                if (get_object(obj)) {
                        next_obj = obj;
                        break;