Skip to content

L
linux-davinci
Commit 5e1f65a6 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files
Options

[PATCH] uml: Whitespace fixes 

arch/um/kernel/tlb.c had some pretty serious whitespace problems.  I also
fixed some returns.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8f80e946
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 184 deletions
arch/um/kernel/tlb.c
View file @ 5e1f65a6
/* /*
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
#include "os.h" #include "os.h"
static int add_mmap(unsigned long virt, unsigned long phys, unsigned long len, static int add_mmap(unsigned long virt, unsigned long phys, unsigned long len,
int r, int w, int x, struct host_vm_op *ops, int *index, int r, int w, int x, struct host_vm_op *ops, int *index,
int last_filled, union mm_context *mmu, void **flush, int last_filled, union mm_context *mmu, void **flush,
int (*do_ops)(union mm_context *, struct host_vm_op *, int (*do_ops)(union mm_context *, struct host_vm_op *,
int, int, void **)) int, int, void **))
{ {
__u64 offset; __u64 offset;
struct host_vm_op *last; struct host_vm_op *last;
int fd, ret = 0; int fd, ret = 0;
...@@ -89,7 +89,7 @@ static int add_munmap(unsigned long addr, unsigned long len, ...@@ -89,7 +89,7 @@ static int add_munmap(unsigned long addr, unsigned long len,
static int add_mprotect(unsigned long addr, unsigned long len, int r, int w, static int add_mprotect(unsigned long addr, unsigned long len, int r, int w,
int x, struct host_vm_op *ops, int *index, int x, struct host_vm_op *ops, int *index,
int last_filled, union mm_context *mmu, void **flush, int last_filled, union mm_context *mmu, void **flush,
int (*do_ops)(union mm_context *, struct host_vm_op *, int (*do_ops)(union mm_context *, struct host_vm_op *,
int, int, void **)) int, int, void **))
{ {
struct host_vm_op *last; struct host_vm_op *last;
...@@ -124,106 +124,105 @@ static int add_mprotect(unsigned long addr, unsigned long len, int r, int w, ...@@ -124,106 +124,105 @@ static int add_mprotect(unsigned long addr, unsigned long len, int r, int w,
#define ADD_ROUND(n, inc) (((n) + (inc)) & ~((inc) - 1)) #define ADD_ROUND(n, inc) (((n) + (inc)) & ~((inc) - 1))
void fix_range_common(struct mm_struct *mm, unsigned long start_addr, void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
unsigned long end_addr, int force, unsigned long end_addr, int force,
int (*do_ops)(union mm_context *, struct host_vm_op *, int (*do_ops)(union mm_context *, struct host_vm_op *,
int, int, void **)) int, int, void **))
{ {
pgd_t *npgd; pgd_t *npgd;
pud_t *npud; pud_t *npud;
pmd_t *npmd; pmd_t *npmd;
pte_t *npte; pte_t *npte;
union mm_context *mmu = &mm->context; union mm_context *mmu = &mm->context;
unsigned long addr, end; unsigned long addr, end;
int r, w, x; int r, w, x;
struct host_vm_op ops[1]; struct host_vm_op ops[1];
void *flush = NULL; void *flush = NULL;
int op_index = -1, last_op = ARRAY_SIZE(ops) - 1; int op_index = -1, last_op = ARRAY_SIZE(ops) - 1;
int ret = 0; int ret = 0;
if(mm == NULL) if(mm == NULL)
return; return;
ops[0].type = NONE; ops[0].type = NONE;
for(addr = start_addr; addr < end_addr && !ret;){ for(addr = start_addr; addr < end_addr && !ret;){
npgd = pgd_offset(mm, addr); npgd = pgd_offset(mm, addr);
if(!pgd_present(*npgd)){ if(!pgd_present(*npgd)){
end = ADD_ROUND(addr, PGDIR_SIZE); end = ADD_ROUND(addr, PGDIR_SIZE);
if(end > end_addr) if(end > end_addr)
end = end_addr; end = end_addr;
if(force || pgd_newpage(*npgd)){ if(force || pgd_newpage(*npgd)){
ret = add_munmap(addr, end - addr, ops, ret = add_munmap(addr, end - addr, ops,
&op_index, last_op, mmu, &op_index, last_op, mmu,
&flush, do_ops); &flush, do_ops);
pgd_mkuptodate(*npgd); pgd_mkuptodate(*npgd);
} }
addr = end; addr = end;
continue; continue;
} }
npud = pud_offset(npgd, addr); npud = pud_offset(npgd, addr);
if(!pud_present(*npud)){ if(!pud_present(*npud)){
end = ADD_ROUND(addr, PUD_SIZE); end = ADD_ROUND(addr, PUD_SIZE);
if(end > end_addr) if(end > end_addr)
end = end_addr; end = end_addr;
if(force || pud_newpage(*npud)){ if(force || pud_newpage(*npud)){
ret = add_munmap(addr, end - addr, ops, ret = add_munmap(addr, end - addr, ops,
&op_index, last_op, mmu, &op_index, last_op, mmu,
&flush, do_ops); &flush, do_ops);
pud_mkuptodate(*npud); pud_mkuptodate(*npud);
} }
addr = end; addr = end;
continue; continue;
} }
npmd = pmd_offset(npud, addr); npmd = pmd_offset(npud, addr);
if(!pmd_present(*npmd)){ if(!pmd_present(*npmd)){
end = ADD_ROUND(addr, PMD_SIZE); end = ADD_ROUND(addr, PMD_SIZE);
if(end > end_addr) if(end > end_addr)
end = end_addr; end = end_addr;
if(force || pmd_newpage(*npmd)){ if(force || pmd_newpage(*npmd)){
ret = add_munmap(addr, end - addr, ops, ret = add_munmap(addr, end - addr, ops,
&op_index, last_op, mmu, &op_index, last_op, mmu,
&flush, do_ops); &flush, do_ops);
pmd_mkuptodate(*npmd); pmd_mkuptodate(*npmd);
} }
addr = end; addr = end;
continue; continue;
} }
npte = pte_offset_kernel(npmd, addr); npte = pte_offset_kernel(npmd, addr);
r = pte_read(*npte); r = pte_read(*npte);
w = pte_write(*npte); w = pte_write(*npte);
x = pte_exec(*npte); x = pte_exec(*npte);
if (!pte_young(*npte)) { if (!pte_young(*npte)) {
r = 0; r = 0;
w = 0; w = 0;
} else if (!pte_dirty(*npte)) { } else if (!pte_dirty(*npte)) {
w = 0; w = 0;
} }
if(force || pte_newpage(*npte)){ if(force || pte_newpage(*npte)){
if(pte_present(*npte)) if(pte_present(*npte))
ret = add_mmap(addr, ret = add_mmap(addr,
pte_val(*npte) & PAGE_MASK, pte_val(*npte) & PAGE_MASK,
PAGE_SIZE, r, w, x, ops, PAGE_SIZE, r, w, x, ops,
&op_index, last_op, mmu, &op_index, last_op, mmu,
&flush, do_ops); &flush, do_ops);
else ret = add_munmap(addr, PAGE_SIZE, ops, else ret = add_munmap(addr, PAGE_SIZE, ops,
&op_index, last_op, mmu, &op_index, last_op, mmu,
&flush, do_ops); &flush, do_ops);
} }
else if(pte_newprot(*npte)) else if(pte_newprot(*npte))
ret = add_mprotect(addr, PAGE_SIZE, r, w, x, ops, ret = add_mprotect(addr, PAGE_SIZE, r, w, x, ops,
&op_index, last_op, mmu, &op_index, last_op, mmu,
&flush, do_ops); &flush, do_ops);
*npte = pte_mkuptodate(*npte); *npte = pte_mkuptodate(*npte);
addr += PAGE_SIZE; addr += PAGE_SIZE;
} }
if(!ret) if(!ret)
ret = (*do_ops)(mmu, ops, op_index, 1, &flush); ret = (*do_ops)(mmu, ops, op_index, 1, &flush);
/* This is not an else because ret is modified above */ /* This is not an else because ret is modified above */
if(ret) { if(ret) {
printk("fix_range_common: failed, killing current process\n"); printk("fix_range_common: failed, killing current process\n");
force_sig(SIGKILL, current); force_sig(SIGKILL, current);
...@@ -232,160 +231,160 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, ...@@ -232,160 +231,160 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
int flush_tlb_kernel_range_common(unsigned long start, unsigned long end) int flush_tlb_kernel_range_common(unsigned long start, unsigned long end)
{ {
struct mm_struct *mm; struct mm_struct *mm;
pgd_t *pgd; pgd_t *pgd;
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pte_t *pte; pte_t *pte;
unsigned long addr, last; unsigned long addr, last;
int updated = 0, err; int updated = 0, err;
mm = &init_mm; mm = &init_mm;
for(addr = start; addr < end;){ for(addr = start; addr < end;){
pgd = pgd_offset(mm, addr); pgd = pgd_offset(mm, addr);
if(!pgd_present(*pgd)){ if(!pgd_present(*pgd)){
last = ADD_ROUND(addr, PGDIR_SIZE); last = ADD_ROUND(addr, PGDIR_SIZE);
if(last > end) if(last > end)
last = end; last = end;
if(pgd_newpage(*pgd)){ if(pgd_newpage(*pgd)){
updated = 1; updated = 1;
err = os_unmap_memory((void *) addr, err = os_unmap_memory((void *) addr,
last - addr); last - addr);
if(err < 0) if(err < 0)
panic("munmap failed, errno = %d\n", panic("munmap failed, errno = %d\n",
-err); -err);
} }
addr = last; addr = last;
continue; continue;
} }
pud = pud_offset(pgd, addr); pud = pud_offset(pgd, addr);
if(!pud_present(*pud)){ if(!pud_present(*pud)){
last = ADD_ROUND(addr, PUD_SIZE); last = ADD_ROUND(addr, PUD_SIZE);
if(last > end) if(last > end)
last = end; last = end;
if(pud_newpage(*pud)){ if(pud_newpage(*pud)){
updated = 1; updated = 1;
err = os_unmap_memory((void *) addr, err = os_unmap_memory((void *) addr,
last - addr); last - addr);
if(err < 0) if(err < 0)
panic("munmap failed, errno = %d\n", panic("munmap failed, errno = %d\n",
-err); -err);
} }
addr = last; addr = last;
continue; continue;
} }
pmd = pmd_offset(pud, addr); pmd = pmd_offset(pud, addr);
if(!pmd_present(*pmd)){ if(!pmd_present(*pmd)){
last = ADD_ROUND(addr, PMD_SIZE); last = ADD_ROUND(addr, PMD_SIZE);
if(last > end) if(last > end)
last = end; last = end;
if(pmd_newpage(*pmd)){ if(pmd_newpage(*pmd)){
updated = 1; updated = 1;
err = os_unmap_memory((void *) addr, err = os_unmap_memory((void *) addr,
last - addr); last - addr);
if(err < 0) if(err < 0)
panic("munmap failed, errno = %d\n", panic("munmap failed, errno = %d\n",
-err); -err);
} }
addr = last; addr = last;
continue; continue;
} }
pte = pte_offset_kernel(pmd, addr); pte = pte_offset_kernel(pmd, addr);
if(!pte_present(*pte) || pte_newpage(*pte)){ if(!pte_present(*pte) || pte_newpage(*pte)){
updated = 1; updated = 1;
err = os_unmap_memory((void *) addr, err = os_unmap_memory((void *) addr,
PAGE_SIZE); PAGE_SIZE);
if(err < 0) if(err < 0)
panic("munmap failed, errno = %d\n", panic("munmap failed, errno = %d\n",
-err); -err);
if(pte_present(*pte)) if(pte_present(*pte))
map_memory(addr, map_memory(addr,
pte_val(*pte) & PAGE_MASK, pte_val(*pte) & PAGE_MASK,
PAGE_SIZE, 1, 1, 1); PAGE_SIZE, 1, 1, 1);
} }
else if(pte_newprot(*pte)){ else if(pte_newprot(*pte)){
updated = 1; updated = 1;
os_protect_memory((void *) addr, PAGE_SIZE, 1, 1, 1); os_protect_memory((void *) addr, PAGE_SIZE, 1, 1, 1);
} }
addr += PAGE_SIZE; addr += PAGE_SIZE;
} }
return(updated); return(updated);
} }
pgd_t *pgd_offset_proc(struct mm_struct *mm, unsigned long address) pgd_t *pgd_offset_proc(struct mm_struct *mm, unsigned long address)
{ {
return(pgd_offset(mm, address)); return(pgd_offset(mm, address));
} }
pud_t *pud_offset_proc(pgd_t *pgd, unsigned long address) pud_t *pud_offset_proc(pgd_t *pgd, unsigned long address)
{ {
return(pud_offset(pgd, address)); return(pud_offset(pgd, address));
} }
pmd_t *pmd_offset_proc(pud_t *pud, unsigned long address) pmd_t *pmd_offset_proc(pud_t *pud, unsigned long address)
{ {
return(pmd_offset(pud, address)); return(pmd_offset(pud, address));
} }
pte_t *pte_offset_proc(pmd_t *pmd, unsigned long address) pte_t *pte_offset_proc(pmd_t *pmd, unsigned long address)
{ {
return(pte_offset_kernel(pmd, address)); return(pte_offset_kernel(pmd, address));
} }
pte_t *addr_pte(struct task_struct *task, unsigned long addr) pte_t *addr_pte(struct task_struct *task, unsigned long addr)
{ {
pgd_t *pgd = pgd_offset(task->mm, addr); pgd_t *pgd = pgd_offset(task->mm, addr);
pud_t *pud = pud_offset(pgd, addr); pud_t *pud = pud_offset(pgd, addr);
pmd_t *pmd = pmd_offset(pud, addr); pmd_t *pmd = pmd_offset(pud, addr);
return(pte_offset_map(pmd, addr)); return(pte_offset_map(pmd, addr));
} }
void flush_tlb_page(struct vm_area_struct *vma, unsigned long address) void flush_tlb_page(struct vm_area_struct *vma, unsigned long address)
{ {
address &= PAGE_MASK; address &= PAGE_MASK;
flush_tlb_range(vma, address, address + PAGE_SIZE); flush_tlb_range(vma, address, address + PAGE_SIZE);
} }
void flush_tlb_all(void) void flush_tlb_all(void)
{ {
flush_tlb_mm(current->mm); flush_tlb_mm(current->mm);
} }
void flush_tlb_kernel_range(unsigned long start, unsigned long end) void flush_tlb_kernel_range(unsigned long start, unsigned long end)
{ {
CHOOSE_MODE_PROC(flush_tlb_kernel_range_tt, CHOOSE_MODE_PROC(flush_tlb_kernel_range_tt,
flush_tlb_kernel_range_common, start, end); flush_tlb_kernel_range_common, start, end);
} }
void flush_tlb_kernel_vm(void) void flush_tlb_kernel_vm(void)
{ {
CHOOSE_MODE(flush_tlb_kernel_vm_tt(), CHOOSE_MODE(flush_tlb_kernel_vm_tt(),
flush_tlb_kernel_range_common(start_vm, end_vm)); flush_tlb_kernel_range_common(start_vm, end_vm));
} }
void __flush_tlb_one(unsigned long addr) void __flush_tlb_one(unsigned long addr)
{ {
CHOOSE_MODE_PROC(__flush_tlb_one_tt, __flush_tlb_one_skas, addr); CHOOSE_MODE_PROC(__flush_tlb_one_tt, __flush_tlb_one_skas, addr);
} }
void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
unsigned long end) unsigned long end)
{ {
CHOOSE_MODE_PROC(flush_tlb_range_tt, flush_tlb_range_skas, vma, start, CHOOSE_MODE_PROC(flush_tlb_range_tt, flush_tlb_range_skas, vma, start,
end); end);
} }
void flush_tlb_mm(struct mm_struct *mm) void flush_tlb_mm(struct mm_struct *mm)
{ {
CHOOSE_MODE_PROC(flush_tlb_mm_tt, flush_tlb_mm_skas, mm); CHOOSE_MODE_PROC(flush_tlb_mm_tt, flush_tlb_mm_skas, mm);
} }
void force_flush_all(void) void force_flush_all(void)
{ {
CHOOSE_MODE(force_flush_all_tt(), force_flush_all_skas()); CHOOSE_MODE(force_flush_all_tt(), force_flush_all_skas());
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment