aboutsummaryrefslogtreecommitdiff
path: root/mm/hugetlb.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-11-07 12:26:59 +0100
committerAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>2005-11-07 12:26:59 +0100
commitb7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (patch)
tree66bf5c66ed505a739bf8633d1931f0d0526bd6d6 /mm/hugetlb.c
parent65163fd73c65e4c61437c28ac4ef9f3c5ba16a80 (diff)
parent0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff)
Merge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r--mm/hugetlb.c3
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)
unsigned long i;
struct page *page;
+ if (HPAGE_SHIFT == 0)
+ return 0;
+
for (i = 0; i < MAX_NUMNODES; ++i)
INIT_LIST_HEAD(&hugepage_freelists[i]);