Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40950
b: refs/heads/master
c: 31be830
h: refs/heads/master
v: v3
  • Loading branch information
OGAWA Hirofumi authored and Linus Torvalds committed Nov 16, 2006
1 parent 04dc70b commit ed8b784
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 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: da63fc7ce63b43426dc3c69c05e28de2872c159a
refs/heads/master: 31be8309532a6743f301cb2e83bd12ca07988b09
5 changes: 2 additions & 3 deletions trunk/mm/vmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,13 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long fl
}
addr = ALIGN(start, align);
size = PAGE_ALIGN(size);
if (unlikely(!size))
return NULL;

area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node);
if (unlikely(!area))
return NULL;

if (unlikely(!size))
return NULL;

/*
* We always allocate a guard page.
*/
Expand Down

0 comments on commit ed8b784

Please sign in to comment.