diff --git a/[refs] b/[refs] index 7924748d9d76..a76885aa0ff2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90d7404558fbe6f369d5e27b5ea3ef1e57562d3d +refs/heads/master: e7d86340793e7162126926ec9d226c68f4e37f94 diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index b7e314b1009f..8b5e4370540b 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -732,7 +732,7 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask) node, gfp_mask); if (unlikely(IS_ERR(va))) { kfree(vb); - return ERR_PTR(PTR_ERR(va)); + return ERR_CAST(va); } err = radix_tree_preload(gfp_mask);