[PATCH 5/7] sh: pte_mkhuge() compile fix for !CONFIG_HUGETLB_PAGE.

From: Paul Mundt
Date: Wed Nov 02 2005 - 17:31:42 EST


Presently it is bogus to call pte_mkhuge() outside of the
CONFIG_HUGETLB_PAGE context, as the only processors that support
_PAGE_SZHUGE do so in the hugetlbpage context only (and this is the only
time that _PAGE_SZHUGE is even defined). SH-2 and SH-3 do not support
huge pages at all, and so it is not possible to enable this.

Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

---

include/asm-sh/pgtable.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

applies-to: 0aae3fb59b1e7a2877f297fbdc5acb7d281498ad
e1789731db5df57ba5a775be94f4d4e2a5a1c6de
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index aef8ae4..dee36bc 100644
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -196,7 +196,9 @@ static inline pte_t pte_mkexec(pte_t pte
static inline pte_t pte_mkdirty(pte_t pte) { set_pte(&pte, __pte(pte_val(pte) | _PAGE_DIRTY)); return pte; }
static inline pte_t pte_mkyoung(pte_t pte) { set_pte(&pte, __pte(pte_val(pte) | _PAGE_ACCESSED)); return pte; }
static inline pte_t pte_mkwrite(pte_t pte) { set_pte(&pte, __pte(pte_val(pte) | _PAGE_RW)); return pte; }
+#ifdef CONFIG_HUGETLB_PAGE
static inline pte_t pte_mkhuge(pte_t pte) { set_pte(&pte, __pte(pte_val(pte) | _PAGE_SZHUGE)); return pte; }
+#endif

/*
* Macro and implementation to make a page protection as uncachable.
---
0.99.8.GIT
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/