Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108238
b: refs/heads/master
c: caff3a2
h: refs/heads/master
v: v3
  • Loading branch information
Gerald Schaefer authored and Linus Torvalds committed Aug 12, 2008
1 parent f7a5bb4 commit af67d09
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 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: 02eb7eeb8990b9cbd32c7bc1ef2d431ca390e44a
refs/heads/master: caff3a2c333e11a794308bd9a875a09b94fee24a
7 changes: 6 additions & 1 deletion trunk/mm/hugetlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid)
huge_page_order(h));
if (page) {
if (arch_prepare_hugepage(page)) {
__free_pages(page, HUGETLB_PAGE_ORDER);
__free_pages(page, huge_page_order(h));
return NULL;
}
prep_new_huge_page(h, page, nid);
Expand Down Expand Up @@ -665,6 +665,11 @@ static struct page *alloc_buddy_huge_page(struct hstate *h,
__GFP_REPEAT|__GFP_NOWARN,
huge_page_order(h));

if (page && arch_prepare_hugepage(page)) {
__free_pages(page, huge_page_order(h));
return NULL;
}

spin_lock(&hugetlb_lock);
if (page) {
/*
Expand Down

0 comments on commit af67d09

Please sign in to comment.