Merge "mm: add preempt points into __purge_vmap_area_lazy()" (a3424d9f) · Commits · e / devices / android_kernel_sony_msm8998

mm/vmalloc.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -656,7 +656,7 @@ static bool __purge_vmap_area_lazy(unsigned long start, unsigned long end)
		struct llist_node *valist;
		struct vmap_area *va;
		struct vmap_area *n_va;
		int nr = 0;
		bool do_free = false;

		lockdep_assert_held(&vmap_purge_lock);

		@@ -666,18 +666,22 @@ static bool __purge_vmap_area_lazy(unsigned long start, unsigned long end)
		start = va->va_start;
		if (va->va_end > end)
		end = va->va_end;
		nr += (va->va_end - va->va_start) >> PAGE_SHIFT;
		do_free = true;
		}

		if (!nr)
		if (!do_free)
		return false;

		atomic_sub(nr, &vmap_lazy_nr);
		flush_tlb_kernel_range(start, end);

		spin_lock(&vmap_area_lock);
		llist_for_each_entry_safe(va, n_va, valist, purge_list)
		llist_for_each_entry_safe(va, n_va, valist, purge_list) {
		int nr = (va->va_end - va->va_start) >> PAGE_SHIFT;

		__free_vmap_area(va);
		atomic_sub(nr, &vmap_lazy_nr);
		cond_resched_lock(&vmap_area_lock);
		}
		spin_unlock(&vmap_area_lock);
		return true;
		}