diff --git a/[refs] b/[refs] index 96067cc2b732..86e57da8ce44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64e34ca99abc4749ff7fa752f02653d115c577b1 +refs/heads/master: 5286031693d14ae20ce4298d002eddc2044e19a4 diff --git a/trunk/include/asm-sh/pgtable_64.h b/trunk/include/asm-sh/pgtable_64.h index 972211671c9a..bfdcb2084fa4 100644 --- a/trunk/include/asm-sh/pgtable_64.h +++ b/trunk/include/asm-sh/pgtable_64.h @@ -137,6 +137,14 @@ static __inline__ void pmd_set(pmd_t *pmdp,pte_t *ptep) #define _PAGE_SZHUGE (_PAGE_SIZE0 | _PAGE_SIZE1) #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 (0) +#endif + /* * Default flags for a Kernel page. * This is fundametally also SHARED because the main use of this define