From d053e8bc7a59af5f18579bea2616eb99f1293aef Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Thu, 31 Jul 2008 00:07:30 -0700 Subject: [PATCH] --- yaml --- r: 107479 b: refs/heads/master c: 0ef89d25d3e390dfa7c46772907951744a4067dc h: refs/heads/master i: 107477: 7256f03ca127585350a845f7103bc7aa9ecda416 107475: 512fb4a929b6c22d3cbf8b6aa830474954c4d231 107471: a8d4c05dc717ef09a59a53703effc5459740144a v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cd461147f86f..69b21cb1f7c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6de002617c199f80f9a2a713dffc263bdc69b81 +refs/heads/master: 0ef89d25d3e390dfa7c46772907951744a4067dc diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index d237a02eb228..28a2980ee435 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -1283,7 +1283,12 @@ module_exit(hugetlb_exit); static int __init hugetlb_init(void) { - BUILD_BUG_ON(HPAGE_SHIFT == 0); + /* Some platform decide whether they support huge pages at boot + * time. On these, such as powerpc, HPAGE_SHIFT is set to 0 when + * there is no such support + */ + if (HPAGE_SHIFT == 0) + return 0; if (!size_to_hstate(default_hstate_size)) { default_hstate_size = HPAGE_SIZE;