From bae05abc64858be509cc8f3a3baf48d738bdac73 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@redhat.com>
Date: Wed, 19 Nov 2008 15:36:33 -0800
Subject: [PATCH] --- yaml --- r: 119189 b: refs/heads/master c:
 0ae15132a4f5c758a6ffcde74495641dc3f62ba1 h: refs/heads/master i:   119187:
 0d7f9ad20647eb00417919bcc4c94b7d05ac6dc2 v: v3

---
 [refs]             | 2 +-
 trunk/mm/vmalloc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cf7ab07bce01..3a5d009cb2e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 496850e5f5a372029ceb2b35c811770a9bb073b6
+refs/heads/master: 0ae15132a4f5c758a6ffcde74495641dc3f62ba1
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 04f5e320e744..30f826d484f0 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -324,14 +324,14 @@ static struct vmap_area *alloc_vmap_area(unsigned long size,
 
 	BUG_ON(size & ~PAGE_MASK);
 
-	addr = ALIGN(vstart, align);
-
 	va = kmalloc_node(sizeof(struct vmap_area),
 			gfp_mask & GFP_RECLAIM_MASK, node);
 	if (unlikely(!va))
 		return ERR_PTR(-ENOMEM);
 
 retry:
+	addr = ALIGN(vstart, align);
+
 	spin_lock(&vmap_area_lock);
 	/* XXX: could have a last_hole cache */
 	n = vmap_area_root.rb_node;