From 8d513822234fed7fefb688a810ac2c909d00fddb Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 13 Jan 2011 15:46:15 -0800
Subject: [PATCH] --- yaml --- r: 230730 b: refs/heads/master c:
 ddf9c6d472825ceda66b3adff0f6437dbcd37f71 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 030c24b01bb1..36de52a0ecd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e50df39f6e2c3a4a3394df62baa8a213df16c54
+refs/heads/master: ddf9c6d472825ceda66b3adff0f6437dbcd37f71
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 284346ee0e91..cac13b415635 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -748,7 +748,7 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
 	va = alloc_vmap_area(VMAP_BLOCK_SIZE, VMAP_BLOCK_SIZE,
 					VMALLOC_START, VMALLOC_END,
 					node, gfp_mask);
-	if (unlikely(IS_ERR(va))) {
+	if (IS_ERR(va)) {
 		kfree(vb);
 		return ERR_CAST(va);
 	}