Messages in this thread Patch in this message | | | Date | Sat, 22 Oct 2005 17:27:01 +0100 (BST) | From | Hugh Dickins <> | Subject | [PATCH 6/9] mm: uml kill unused |
| |
In worrying over the various pte operations in different architectures, I came across some unused functions in UML: remove mprotect_kernel_vm, protect_vm_page and addr_pte.
Signed-off-by: Hugh Dickins <hugh@veritas.com> ---
arch/um/include/tlb.h | 1 - arch/um/kernel/tlb.c | 9 --------- arch/um/kernel/tt/tlb.c | 36 ------------------------------------ 3 files changed, 46 deletions(-)
--- mm5/arch/um/include/tlb.h 2005-10-11 12:07:16.000000000 +0100 +++ mm6/arch/um/include/tlb.h 2005-10-22 14:07:12.000000000 +0100 @@ -34,7 +34,6 @@ struct host_vm_op { } u; }; -extern void mprotect_kernel_vm(int w); extern void force_flush_all(void); extern void fix_range_common(struct mm_struct *mm, unsigned long start_addr, unsigned long end_addr, int force, --- mm5/arch/um/kernel/tlb.c 2005-10-11 12:07:16.000000000 +0100 +++ mm6/arch/um/kernel/tlb.c 2005-10-22 14:07:12.000000000 +0100 @@ -334,15 +334,6 @@ pte_t *pte_offset_proc(pmd_t *pmd, unsig return(pte_offset_kernel(pmd, address)); } -pte_t *addr_pte(struct task_struct *task, unsigned long addr) -{ - pgd_t *pgd = pgd_offset(task->mm, addr); - pud_t *pud = pud_offset(pgd, addr); - pmd_t *pmd = pmd_offset(pud, addr); - - return(pte_offset_map(pmd, addr)); -} - void flush_tlb_page(struct vm_area_struct *vma, unsigned long address) { address &= PAGE_MASK; --- mm5/arch/um/kernel/tt/tlb.c 2005-10-11 12:07:16.000000000 +0100 +++ mm6/arch/um/kernel/tt/tlb.c 2005-10-22 14:07:12.000000000 +0100 @@ -74,42 +74,6 @@ void flush_tlb_kernel_range_tt(unsigned atomic_inc(&vmchange_seq); } -static void protect_vm_page(unsigned long addr, int w, int must_succeed) -{ - int err; - - err = protect_memory(addr, PAGE_SIZE, 1, w, 1, must_succeed); - if(err == 0) return; - else if((err == -EFAULT) || (err == -ENOMEM)){ - flush_tlb_kernel_range(addr, addr + PAGE_SIZE); - protect_vm_page(addr, w, 1); - } - else panic("protect_vm_page : protect failed, errno = %d\n", err); -} - -void mprotect_kernel_vm(int w) -{ - struct mm_struct *mm; - pgd_t *pgd; - pud_t *pud; - pmd_t *pmd; - pte_t *pte; - unsigned long addr; - - mm = &init_mm; - for(addr = start_vm; addr < end_vm;){ - pgd = pgd_offset(mm, addr); - pud = pud_offset(pgd, addr); - pmd = pmd_offset(pud, addr); - if(pmd_present(*pmd)){ - pte = pte_offset_kernel(pmd, addr); - if(pte_present(*pte)) protect_vm_page(addr, w, 0); - addr += PAGE_SIZE; - } - else addr += PMD_SIZE; - } -} - void flush_tlb_kernel_vm_tt(void) { flush_tlb_kernel_range(start_vm, end_vm); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |