From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 6 Dec 2006 02:20:53 +0000 (+0900)
Subject: sh: Fixup pte_mkhuge() build failure.
X-Git-Tag: v2.6.20-rc1~34^2~20^2~32^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b67954e804465a4658dd4da8d52b87a8d1ea00c;p=linux-2.6

sh: Fixup pte_mkhuge() build failure.

When hugetlbpage support isn't enabled, this can be bogus.
Wrap it back in _PAGE_FLAGS_HARD to avoid changes to the
base PTE when not aiming for larger sizes.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index f87504abb4..c84901dbd8 100644
--- a/include/asm-sh/pgtable.h
+++ b/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)