aboutsummaryrefslogtreecommitdiffstats
path: root/mm/vmalloc.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2011-01-13 15:46:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 17:32:36 -0800
commitddf9c6d472825ceda66b3adff0f6437dbcd37f71 (patch)
treea838e5535d5bad4391dcec4584d44a0e3b05858b /mm/vmalloc.c
parent1e50df39f6e2c3a4a3394df62baa8a213df16c54 (diff)
downloadkernel_samsung_aries-ddf9c6d472825ceda66b3adff0f6437dbcd37f71.zip
kernel_samsung_aries-ddf9c6d472825ceda66b3adff0f6437dbcd37f71.tar.gz
kernel_samsung_aries-ddf9c6d472825ceda66b3adff0f6437dbcd37f71.tar.bz2
vmalloc: remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmalloc.c')
-rw-r--r--mm/vmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 284346e..cac13b4 100644
--- a/mm/vmalloc.c
+++ b/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);
}