From d3c839d175f80f81654ed9c73acd2e564a721c12 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 21 Apr 2007 10:52:32 +0100 Subject: [PATCH] --- yaml --- r: 53979 b: refs/heads/master c: c172cc92c87103c98b5cd359205b684bf99b5067 h: refs/heads/master i: 53977: 60d95039bdadd60ff7e66b115777160bab367c69 53975: 95e6763ac547491c248612d60b97ca82d371f940 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/ioremap.c | 3 ++- trunk/arch/arm/mm/mm.h | 1 + trunk/arch/arm/mm/mmu.c | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a75f29cbf323..8b0bca41fb75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b29e9f5e64fb90d2e4be1c7ef8c925b56669c74a +refs/heads/master: c172cc92c87103c98b5cd359205b684bf99b5067 diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c index b26b36109d54..216623eece35 100644 --- a/trunk/arch/arm/mm/ioremap.c +++ b/trunk/arch/arm/mm/ioremap.c @@ -55,7 +55,8 @@ static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end, if (!pte_none(*pte)) goto bad; - set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), 0); + set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), + type->prot_pte_ext); phys_addr += PAGE_SIZE; } while (pte++, addr += PAGE_SIZE, addr != end); return 0; diff --git a/trunk/arch/arm/mm/mm.h b/trunk/arch/arm/mm/mm.h index 66f8612c5e5b..7647c597fc59 100644 --- a/trunk/arch/arm/mm/mm.h +++ b/trunk/arch/arm/mm/mm.h @@ -18,6 +18,7 @@ static inline pmd_t *pmd_off_k(unsigned long virt) struct mem_type { unsigned int prot_pte; + unsigned int prot_pte_ext; unsigned int prot_l1; unsigned int prot_sect; unsigned int domain; diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/arch/arm/mm/mmu.c index 6cb80b4973d2..360405515bbd 100644 --- a/trunk/arch/arm/mm/mmu.c +++ b/trunk/arch/arm/mm/mmu.c @@ -391,7 +391,8 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, pte = pte_offset_kernel(pmd, addr); do { - set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), 0); + set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), + type->prot_pte_ext); pfn++; } while (pte++, addr += PAGE_SIZE, addr != end); }