Merge tag 'v3.10.74' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index d365724feb05206fc0b37c852f5859499f1cb6b3..0a77f6632f482df1be3609558d94bf334863388b 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -388,12 +388,12 @@ nocache:
                addr = ALIGN(first->va_end, align);
                if (addr < vstart)
                        goto nocache;
-               if (addr + size - 1 < addr)
+               if (addr + size < addr)
                        goto overflow;
 
        } else {
                addr = ALIGN(vstart, align);
-               if (addr + size - 1 < addr)
+               if (addr + size < addr)
                        goto overflow;
 
                n = vmap_area_root.rb_node;
@@ -420,14 +420,21 @@ nocache:
                if (addr + cached_hole_size < first->va_start)
                        cached_hole_size = first->va_start - addr;
                addr = ALIGN(first->va_end, align);
-               if (addr + size - 1 < addr)
+               if (addr + size < addr)
                        goto overflow;
 
+               /*
                if (list_is_last(&first->list, &vmap_area_list))
                        goto found;
 
                first = list_entry(first->list.next,
                                struct vmap_area, list);
+               */
+               n = rb_next(&first->rb_node);
+               if (n)
+                       first = rb_entry(n, struct vmap_area, rb_node);
+               else
+                       goto found;
        }
 
 found:
@@ -931,8 +938,13 @@ again:
                int i;
 
                spin_lock(&vb->lock);
-               if (vb->free < 1UL << order)
+               if (vb->free < 1UL << order) {
+            if (vb->free + vb->dirty == VMAP_BBMAP_BITS && vb->dirty != VMAP_BBMAP_BITS) {
+                               /* free left too small, handle as fragmented scenario */
+                               purge = 1;
+                       }
                        goto next;
+        }
 
                i = bitmap_find_free_region(vb->alloc_map,
                                                VMAP_BBMAP_BITS, order);