From d4a05c21c46d51751ef9edfe8caec9373dd32fc6 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 6 Sep 2008 21:15:56 +0100 Subject: [PATCH] --- yaml --- r: 112343 b: refs/heads/master c: 40d192b63d079db1f76cec9ae8ccbf461fda23e4 h: refs/heads/master i: 112341: 1faab1d2bb5a0454cc53bfef9097bb2d195a0aa4 112339: fd2260a40569e4cc81cb8e077ee298fa1c958173 112335: 05569e3ec43dda388718d4b0cec3cd0f787c7b39 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, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 615832764c44..a47bc057d02f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f69c0c1af288d6b124d0a928a33b51061ebf850 +refs/heads/master: 40d192b63d079db1f76cec9ae8ccbf461fda23e4 diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c index b81dbf9ffb77..33eeab0ce3d1 100644 --- a/trunk/arch/arm/mm/ioremap.c +++ b/trunk/arch/arm/mm/ioremap.c @@ -55,8 +55,7 @@ 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), - type->prot_pte_ext); + set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), 0); 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 7647c597fc59..66f8612c5e5b 100644 --- a/trunk/arch/arm/mm/mm.h +++ b/trunk/arch/arm/mm/mm.h @@ -18,7 +18,6 @@ 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 04602288da2c..685dc1bf0083 100644 --- a/trunk/arch/arm/mm/mmu.c +++ b/trunk/arch/arm/mm/mmu.c @@ -418,8 +418,7 @@ 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)), - type->prot_pte_ext); + set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), 0); pfn++; } while (pte++, addr += PAGE_SIZE, addr != end); }