X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fhugetlb.c;h=757ca983fd99cba4b73c563da5c0bb34c1ee396d;hb=12017faf387437c01ff63bbe46b629550b15bd70;hp=254ce2b901588f48a06f61da5692aa82b93ee0cd;hpb=7874d35173d549c1a2b2f77c4b1f94379fa65698;p=linux-2.6

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 254ce2b901..757ca983fd 100644
--- a/mm/hugetlb.c
+++ b/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;