Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / um / kernel / tt / tlb.c

diff --git a/arch/um/kernel/tt/tlb.c b/arch/um/kernel/tt/tlb.c
index 203216a..ae6217c 100644 (file)
--- a/arch/um/kernel/tt/tlb.c
+++ b/arch/um/kernel/tt/tlb.c
@@ -17,25 +17,31 @@
 #include "os.h"
 #include "tlb.h"
 
-static void do_ops(int unused, struct host_vm_op *ops, int last)
+static int do_ops(union mm_context *mmu, struct host_vm_op *ops, int last,
+                   int finished, void **flush)
 {
        struct host_vm_op *op;
-       int i;
+        int i, ret=0;
 
-       for(i = 0; i <= last; i++){
+        for(i = 0; i <= last && !ret; i++){
                op = &ops[i];
                switch(op->type){
                case MMAP:
-                        os_map_memory((void *) op->u.mmap.addr, op->u.mmap.fd,
-                                     op->u.mmap.offset, op->u.mmap.len,
-                                     op->u.mmap.r, op->u.mmap.w,
-                                     op->u.mmap.x);
+                        ret = os_map_memory((void *) op->u.mmap.addr,
+                                            op->u.mmap.fd, op->u.mmap.offset,
+                                            op->u.mmap.len, op->u.mmap.r,
+                                            op->u.mmap.w, op->u.mmap.x);
                        break;
                case MUNMAP:
-                       os_unmap_memory((void *) op->u.munmap.addr,
-                                       op->u.munmap.len);
+                        ret = os_unmap_memory((void *) op->u.munmap.addr,
+                                              op->u.munmap.len);
                        break;
                case MPROTECT:
+                        ret = protect_memory(op->u.mprotect.addr,
+                                             op->u.munmap.len,
+                                             op->u.mprotect.r,
+                                             op->u.mprotect.w,
+                                             op->u.mprotect.x, 1);
                        protect_memory(op->u.mprotect.addr, op->u.munmap.len,
                                       op->u.mprotect.r, op->u.mprotect.w,
                                       op->u.mprotect.x, 1);
@@ -45,6 +51,8 @@ static void do_ops(int unused, struct host_vm_op *ops, int last)
                        break;
                }
        }
+
+       return ret;
 }
 
 static void fix_range(struct mm_struct *mm, unsigned long start_addr, 
@@ -55,7 +63,7 @@ static void fix_range(struct mm_struct *mm, unsigned long start_addr,
                 panic("fix_range fixing wrong address space, current = 0x%p",
                       current);
 
-        fix_range_common(mm, start_addr, end_addr, force, 0, do_ops);
+        fix_range_common(mm, start_addr, end_addr, force, do_ops);
 }
 
 atomic_t vmchange_seq = ATOMIC_INIT(1);
@@ -66,42 +74,6 @@ void flush_tlb_kernel_range_tt(unsigned long start, unsigned long end)
                 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);