Merge tag 'v5.2' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 4c9e150e5ad3..0f76cca32a1c 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -913,7 +913,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) {
                 /*
@@ -972,7 +972,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);
         }