Merge "mm/vmalloc.c: avoid bogus -Wmaybe-uninitialized warning" (be297f2e) · Commits · e / devices / android_kernel_fairphone_FP4

mm/vmalloc.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -918,7 +918,7 @@ adjust_va_to_fit_type(struct vmap_area *va,
		unsigned long nva_start_addr, unsigned long size,
		enum fit_type type)
		{
		struct vmap_area *lva;
		struct vmap_area *lva = NULL;

		if (type == FL_FIT_TYPE) {
		/*
		@@ -977,7 +977,7 @@ adjust_va_to_fit_type(struct vmap_area *va,
		if (type != FL_FIT_TYPE) {
		augment_tree_propagate_from(va);

		if (type == NE_FIT_TYPE)
		if (lva) /* type == NE_FIT_TYPE */
		insert_vmap_area_augment(lva, &va->rb_node,
		&free_vmap_area_root, &free_vmap_area_list);
		}
		@@ -3148,10 +3148,20 @@ struct vm_struct *pcpu_get_vm_areas(const unsigned long offsets,
		if (va == NULL)
		goto overflow;

		/*
		* If required width exeeds current VA block, move
		* base downwards and then recheck.
		*/
		if (base + end > va->va_end) {
		base = pvm_determine_end_from_reverse(&va, align) - end;
		term_area = area;
		continue;
		}

		/*
		* If this VA does not fit, move base downwards and recheck.
		*/
		if (base + start < va->va_start \|\| base + end > va->va_end) {
		if (base + start < va->va_start) {
		va = node_to_va(rb_prev(&va->rb_node));
		base = pvm_determine_end_from_reverse(&va, align) - end;
		term_area = area;