Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 119189
b: refs/heads/master
c: 0ae1513
h: refs/heads/master
i:
  119187: 0d7f9ad
v: v3
  • Loading branch information
Glauber Costa authored and Linus Torvalds committed Nov 20, 2008
1 parent 5cc91ff commit bae05ab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 496850e5f5a372029ceb2b35c811770a9bb073b6
refs/heads/master: 0ae15132a4f5c758a6ffcde74495641dc3f62ba1
4 changes: 2 additions & 2 deletions trunk/mm/vmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bae05ab

Please sign in to comment.