diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-07-13 00:12:18 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-07-13 00:12:18 -0400 |
| commit | 5ea80220d7d1b1f4d460bba646158f85f0297158 (patch) | |
| tree | 497cd7652ec7c072d2d6fe1d21d84bceee3b61f4 | |
| parent | 8b9364113e791a3e6e60891051086e2c4657a6ed (diff) | |
don't define __HAVE_PHYS_MEM_ACCESS_PROT when phys_mem_access_prot() is unavailablelinaro_merge_100712
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -rw-r--r-- | arch/arm/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index ea19775fa53..0d994988172 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -337,9 +337,11 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } #ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE #define pgprot_dmacoherent(prot) \ __pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_BUFFERABLE) +#if __LINUX_ARM_ARCH__ >= 7 #define __HAVE_PHYS_MEM_ACCESS_PROT extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot); +#endif #else #define pgprot_dmacoherent(prot) \ __pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_UNCACHED) |