1 files changed, 16 insertions, 11 deletions

diff --git a/arch/um/kernel/tt/tlb.c b/arch/um/kernel/tt/tlb.c
index 16fc6a28882d..f1d85dbb45b9 100644
--- a/arch/um/kernel/tt/tlb.c
+++ b/arch/um/kernel/tt/tlb.c
@@ -17,26 +17,31 @@
 #include "os.h"
 #include "tlb.h"
 
-static void *do_ops(union mm_context *mmu, struct host_vm_op *ops, int last,
-                    int finished, void *flush)
+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);
@@ -47,7 +52,7 @@ static void *do_ops(union mm_context *mmu, struct host_vm_op *ops, int last,
                 }
         }
 
-        return NULL;
+        return ret;
 }
 
 static void fix_range(struct mm_struct *mm, unsigned long start_addr,