diff options
| -rw-r--r-- | arch/arm/mm/ioremap.c | 3 | ||||
| -rw-r--r-- | arch/arm/mm/mm.h | 1 | ||||
| -rw-r--r-- | arch/arm/mm/mmu.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index b81dbf9ffb77..33eeab0ce3d1 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
| @@ -55,8 +55,7 @@ static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end, | |||
| 55 | if (!pte_none(*pte)) | 55 | if (!pte_none(*pte)) |
| 56 | goto bad; | 56 | goto bad; |
| 57 | 57 | ||
| 58 | set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), | 58 | set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), 0); |
| 59 | type->prot_pte_ext); | ||
| 60 | phys_addr += PAGE_SIZE; | 59 | phys_addr += PAGE_SIZE; |
| 61 | } while (pte++, addr += PAGE_SIZE, addr != end); | 60 | } while (pte++, addr += PAGE_SIZE, addr != end); |
| 62 | return 0; | 61 | return 0; |
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index 7647c597fc59..66f8612c5e5b 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h | |||
| @@ -18,7 +18,6 @@ static inline pmd_t *pmd_off_k(unsigned long virt) | |||
| 18 | 18 | ||
| 19 | struct mem_type { | 19 | struct mem_type { |
| 20 | unsigned int prot_pte; | 20 | unsigned int prot_pte; |
| 21 | unsigned int prot_pte_ext; | ||
| 22 | unsigned int prot_l1; | 21 | unsigned int prot_l1; |
| 23 | unsigned int prot_sect; | 22 | unsigned int prot_sect; |
| 24 | unsigned int domain; | 23 | unsigned int domain; |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 04602288da2c..685dc1bf0083 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
| @@ -418,8 +418,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, | |||
| 418 | 418 | ||
| 419 | pte = pte_offset_kernel(pmd, addr); | 419 | pte = pte_offset_kernel(pmd, addr); |
| 420 | do { | 420 | do { |
| 421 | set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), | 421 | set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), 0); |
| 422 | type->prot_pte_ext); | ||
| 423 | pfn++; | 422 | pfn++; |
| 424 | } while (pte++, addr += PAGE_SIZE, addr != end); | 423 | } while (pte++, addr += PAGE_SIZE, addr != end); |
| 425 | } | 424 | } |
