diff --git a/[refs] b/[refs]
index 52750c19ec9b..377ef118a146 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f36af73304555849985b1fb5c0821c1bfab3a5a0
+refs/heads/master: 5b67954e804465a4658dd4da8d52b87a8d1ea00c
diff --git a/trunk/include/asm-sh/pgtable.h b/trunk/include/asm-sh/pgtable.h
index f87504abb43f..c84901dbd8e5 100644
--- a/trunk/include/asm-sh/pgtable.h
+++ b/trunk/include/asm-sh/pgtable.h
@@ -197,6 +197,14 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 # endif
 #endif
 
+/*
+ * Stub out _PAGE_SZHUGE if we don't have a good definition for it,
+ * to make pte_mkhuge() happy.
+ */
+#ifndef _PAGE_SZHUGE
+# define _PAGE_SZHUGE	(_PAGE_FLAGS_HARD)
+#endif
+
 #define _PAGE_CHG_MASK \
 	(PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | _PAGE_DIRTY)