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;