Skip to content

Commit b38c684

Browse files
Hugh DickinsLinus Torvalds
authored andcommitted
[PATCH] 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> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
1 parent 8f5cd76 commit b38c684

File tree

2 files changed

+0
-37
lines changed

2 files changed

+0
-37
lines changed

arch/um/include/tlb.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ struct host_vm_op {
3434
} u;
3535
};
3636

37-
extern void mprotect_kernel_vm(int w);
3837
extern void force_flush_all(void);
3938
extern void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
4039
unsigned long end_addr, int force,

arch/um/kernel/tt/tlb.c

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -74,42 +74,6 @@ void flush_tlb_kernel_range_tt(unsigned long start, unsigned long end)
7474
atomic_inc(&vmchange_seq);
7575
}
7676

77-
static void protect_vm_page(unsigned long addr, int w, int must_succeed)
78-
{
79-
int err;
80-
81-
err = protect_memory(addr, PAGE_SIZE, 1, w, 1, must_succeed);
82-
if(err == 0) return;
83-
else if((err == -EFAULT) || (err == -ENOMEM)){
84-
flush_tlb_kernel_range(addr, addr + PAGE_SIZE);
85-
protect_vm_page(addr, w, 1);
86-
}
87-
else panic("protect_vm_page : protect failed, errno = %d\n", err);
88-
}
89-
90-
void mprotect_kernel_vm(int w)
91-
{
92-
struct mm_struct *mm;
93-
pgd_t *pgd;
94-
pud_t *pud;
95-
pmd_t *pmd;
96-
pte_t *pte;
97-
unsigned long addr;
98-
99-
mm = &init_mm;
100-
for(addr = start_vm; addr < end_vm;){
101-
pgd = pgd_offset(mm, addr);
102-
pud = pud_offset(pgd, addr);
103-
pmd = pmd_offset(pud, addr);
104-
if(pmd_present(*pmd)){
105-
pte = pte_offset_kernel(pmd, addr);
106-
if(pte_present(*pte)) protect_vm_page(addr, w, 0);
107-
addr += PAGE_SIZE;
108-
}
109-
else addr += PMD_SIZE;
110-
}
111-
}
112-
11377
void flush_tlb_kernel_vm_tt(void)
11478
{
11579
flush_tlb_kernel_range(start_vm, end_vm);

0 commit comments

Comments
 (0)