diff options
Diffstat (limited to 'arch/sparc/include/asm/pgtable_64.h')
| -rw-r--r-- | arch/sparc/include/asm/pgtable_64.h | 15 | 
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 7870be0f5ad..7619f2f792a 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -71,7 +71,6 @@  #define PMD_PADDR	_AC(0xfffffffe,UL)  #define PMD_PADDR_SHIFT	_AC(11,UL) -#ifdef CONFIG_TRANSPARENT_HUGEPAGE  #define PMD_ISHUGE	_AC(0x00000001,UL)  /* This is the PMD layout when PMD_ISHUGE is set.  With 4MB huge @@ -86,7 +85,6 @@  #define PMD_HUGE_ACCESSED	_AC(0x00000080,UL)  #define PMD_HUGE_EXEC		_AC(0x00000040,UL)  #define PMD_HUGE_SPLITTING	_AC(0x00000020,UL) -#endif  /* PGDs point to PMD tables which are 8K aligned.  */  #define PGD_PADDR	_AC(0xfffffffc,UL) @@ -628,6 +626,12 @@ static inline unsigned long pte_special(pte_t pte)  	return pte_val(pte) & _PAGE_SPECIAL;  } +static inline int pmd_large(pmd_t pmd) +{ +	return (pmd_val(pmd) & (PMD_ISHUGE | PMD_HUGE_PRESENT)) == +		(PMD_ISHUGE | PMD_HUGE_PRESENT); +} +  #ifdef CONFIG_TRANSPARENT_HUGEPAGE  static inline int pmd_young(pmd_t pmd)  { @@ -646,12 +650,6 @@ static inline unsigned long pmd_pfn(pmd_t pmd)  	return val >> (PAGE_SHIFT - PMD_PADDR_SHIFT);  } -static inline int pmd_large(pmd_t pmd) -{ -	return (pmd_val(pmd) & (PMD_ISHUGE | PMD_HUGE_PRESENT)) == -		(PMD_ISHUGE | PMD_HUGE_PRESENT); -} -  static inline int pmd_trans_splitting(pmd_t pmd)  {  	return (pmd_val(pmd) & (PMD_ISHUGE|PMD_HUGE_SPLITTING)) == @@ -917,6 +915,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,  	return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);  } +#include <asm/tlbflush.h>  #include <asm-generic/pgtable.h>  /* We provide our own get_unmapped_area to cope with VA holes and  |