浏览代码

[ARM] remove 'prot_pte_ext' from memory type table

This member is now redundant; the memory type is encoded in the Linux
PTE bits.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 16 年之前
父节点
当前提交
40d192b63d
共有 3 个文件被更改,包括 2 次插入5 次删除
  1. 1 2
      arch/arm/mm/ioremap.c
  2. 0 1
      arch/arm/mm/mm.h
  3. 1 2
      arch/arm/mm/mmu.c

+ 1 - 2
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))
 		if (!pte_none(*pte))
 			goto bad;
 			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;
 		phys_addr += PAGE_SIZE;
 	} while (pte++, addr += PAGE_SIZE, addr != end);
 	} while (pte++, addr += PAGE_SIZE, addr != end);
 	return 0;
 	return 0;

+ 0 - 1
arch/arm/mm/mm.h

@@ -18,7 +18,6 @@ static inline pmd_t *pmd_off_k(unsigned long virt)
 
 
 struct mem_type {
 struct mem_type {
 	unsigned int prot_pte;
 	unsigned int prot_pte;
-	unsigned int prot_pte_ext;
 	unsigned int prot_l1;
 	unsigned int prot_l1;
 	unsigned int prot_sect;
 	unsigned int prot_sect;
 	unsigned int domain;
 	unsigned int domain;

+ 1 - 2
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);
 	pte = pte_offset_kernel(pmd, addr);
 	do {
 	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++;
 		pfn++;
 	} while (pte++, addr += PAGE_SIZE, addr != end);
 	} while (pte++, addr += PAGE_SIZE, addr != end);
 }
 }