commit 78c0cbffebe60e1182c8f077de2c06a1a48dc5ae
author Helge Deller <deller@gmx.de> Sun Dec 06 21:25:20 2015 +0100
committer Helge Deller <deller@gmx.de> Sat Dec 12 16:45:23 2015 +0100
tree 270676fe9583e0caf922907a577df3b3dd72d30a
parent 5c477b45792fb8ccd279162483aa57cc8ee40ae1

parisc: Disable huge pages on Mako machines

Mako-based machines (PA8800 and PA8900 CPUs) don't allow aliasing on
non-equaivalent addresses.

Signed-off-by: Helge Deller <deller@gmx.de>

arch/parisc/include/asm/pgtable.h

diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index d8534f9..291cee2 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -372,7 +372,8 @@
  */
 #ifdef CONFIG_HUGETLB_PAGE
 #define pte_huge(pte)           (pte_val(pte) & _PAGE_HUGE)
-#define pte_mkhuge(pte)         (__pte(pte_val(pte) | _PAGE_HUGE))
+#define pte_mkhuge(pte)         (__pte(pte_val(pte) | \
+				 (parisc_requires_coherency() ? 0 : _PAGE_HUGE)))
 #else
 #define pte_huge(pte)           (0)
 #define pte_mkhuge(pte)         (pte)