diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-06 23:01:34 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-06 23:01:34 -0500 |
| commit | b78612b796b0d6cdfba553d456eff008278830e3 (patch) | |
| tree | 595e0503cc152dcc5383f1f2d12e93770ae7c16b /mm | |
| parent | 50eb80068001871339d04b749fb9b198428b56d2 (diff) | |
| parent | 0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index c9b43360fd3..9a565808da3 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -103,6 +103,9 @@ static int __init hugetlb_init(void) | |||
| 103 | unsigned long i; | 103 | unsigned long i; |
| 104 | struct page *page; | 104 | struct page *page; |
| 105 | 105 | ||
| 106 | if (HPAGE_SHIFT == 0) | ||
| 107 | return 0; | ||
| 108 | |||
| 106 | for (i = 0; i < MAX_NUMNODES; ++i) | 109 | for (i = 0; i < MAX_NUMNODES; ++i) |
| 107 | INIT_LIST_HEAD(&hugepage_freelists[i]); | 110 | INIT_LIST_HEAD(&hugepage_freelists[i]); |
| 108 | 111 | ||