diff --git a/[refs] b/[refs] index 1fe4cfbf51bb..fd30cfef0c61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7766970cc13e9071b356b1f2a48a9eb8675bfcce +refs/heads/master: cbb766766f3f2f6d9326c561b1020590642c6e39 diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index ed3705e4b83f..520a75980269 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -505,6 +505,7 @@ static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end, static DEFINE_SPINLOCK(purge_lock); LIST_HEAD(valist); struct vmap_area *va; + struct vmap_area *n_va; int nr = 0; /* @@ -544,7 +545,7 @@ static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end, if (nr) { spin_lock(&vmap_area_lock); - list_for_each_entry(va, &valist, purge_list) + list_for_each_entry_safe(va, n_va, &valist, purge_list) __free_vmap_area(va); spin_unlock(&vmap_area_lock); }