diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 3845c7bd72b4..e6d434523aec 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -5561,10 +5561,11 @@ void __init vmalloc_init(void)
 		vbq = &per_cpu(vmap_block_queue, i);
 		spin_lock_init(&vbq->lock);
 		INIT_LIST_HEAD(&vbq->free);
+		xa_init(&vbq->vmap_blocks);
+
 		p = &per_cpu(vfree_deferred, i);
 		init_llist_head(&p->list);
 		INIT_WORK(&p->wq, delayed_vfree_work);
-		xa_init(&vbq->vmap_blocks);
 	}
 
 	/*